[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-02-03T10-46-09.123Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Validation queue job bug1109853-2013-02-03T10-46-09.123Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The attempt to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1109853-2013-02-02T14-49-07.197Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Description changed to: BLOB support added Fixing error in documentation due line numbering For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Commit Message changed to: BLOB support added Fixing error in documentation due line numbering For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-02-02T06-04-06.016Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The attempt to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug1109853-2013-02-02T06-04-06.016Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Review: Needs Fixing
Unless I'm missing something, the following if condition (and the corresponding
block of code) is repeated twice in jsonitemsequence.cpp :
+} else if (SQLTypes::isString(columnTypes[i])) {
Also, what's the story behind the various new // and // comments?
--
https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Sorry I added this later, I find out this problem when I was creating the paper. -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1109853 into
lp:zorba/jdbc-module.
Commit message:
BLOB support added
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
Bug #1109853 in Zorba: add BLOB support for JDBC module
https://bugs.launchpad.net/zorba/+bug/1109853
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525
BLOB support added
--
https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== modified file 'include/javaids.h'
--- include/javaids.h 2013-01-05 01:04:21 +
+++ include/javaids.h 2013-01-30 01:14:22 +
@@ -77,6 +77,7 @@
jmethodID getInt;
jmethodID getDouble;
jmethodID getString;
+ jmethodID getBLOB;
};
class JavaResultSetMetadata {
public:
@@ -120,6 +121,13 @@
jmethodID getParameterClassName;
jmethodID getParameterType;
};
+class JavaBlob {
+public:
+ bool init();
+ jclass classID;
+ jmethodID getBytes;
+ jmethodID length;
+};
}}; // namespace zorba, jdbc
=== modified file 'include/jdbc.h'
--- include/jdbc.h 2013-01-09 19:41:52 +
+++ include/jdbc.h 2013-01-30 01:14:22 +
@@ -51,6 +51,7 @@
extern JavaResultSetMetadata jResultSetMetadata;
extern JavaPreparedStatement jPreparedStatement;
extern JavaParameterMetadata jParameterMetadata;
+extern JavaBlob jBlob;
extern bool isOutputJSON;
#define CHECK_EXCEPTION if ((lException = env-ExceptionOccurred())) throw JavaException();
=== modified file 'include/sqltypes.h'
--- include/sqltypes.h 2012-12-22 14:35:53 +
+++ include/sqltypes.h 2013-01-30 01:14:22 +
@@ -71,6 +71,8 @@
static void init();
static bool isInt(long lType);
static bool isFloat(long lType);
+static bool isString(long lType);
+static bool isBLOB(long lType);
};
=== modified file 'src/jdbc.xq.src/connection/connectionoptions.cpp'
--- src/jdbc.xq.src/connection/connectionoptions.cpp 2012-12-27 22:13:59 +
+++ src/jdbc.xq.src/connection/connectionoptions.cpp 2013-01-30 01:14:22 +
@@ -67,6 +67,4 @@
return ItemSequence_t(new SingletonItemSequence(result));
}
-
-
}}; // namespace zorba, jdbc
=== modified file 'src/jdbc.xq.src/javaids.cpp'
--- src/jdbc.xq.src/javaids.cpp 2013-01-05 01:04:21 +
+++ src/jdbc.xq.src/javaids.cpp 2013-01-30 01:14:22 +
@@ -70,6 +70,7 @@
getInt = env-GetMethodID(classID, getInt, (I)I);
getDouble = env-GetMethodID(classID, getDouble, (I)D);
getString = env-GetMethodID(classID, getString, (I)Ljava/lang/String;);
+getBLOB = env-GetMethodID(classID, getBlob, (I)Ljava/sql/Blob;);
return true;
}
bool JavaResultSetMetadata::init() {
@@ -111,7 +112,12 @@
getParameterType = env-GetMethodID(classID, getParameterType, (I)I);
return true;
}
-
+ bool JavaBlob::init() {
+classID = env-FindClass(java/sql/Blob);
+getBytes = env-GetMethodID(classID, getBytes, (JI)[B);
+length = env-GetMethodID(classID, length, ()J);
+return true;
+ }
}}; // namespace zorba, jdbc
=== modified file 'src/jdbc.xq.src/jdbc.cpp'
--- src/jdbc.xq.src/jdbc.cpp 2013-01-09 22:41:07 +
+++ src/jdbc.xq.src/jdbc.cpp 2013-01-30 01:14:22 +
@@ -69,6 +69,7 @@
JavaResultSetMetadata jResultSetMetadata;
JavaPreparedStatement jPreparedStatement;
JavaParameterMetadata jParameterMetadata;
+JavaBlob jBlob;
bool isOutputJSON = true;
zorba::ExternalFunction*
@@ -333,6 +334,7 @@
jResultSetMetadata.init();
jPreparedStatement.init();
jParameterMetadata.init();
+jBlob.init();
SQLTypes::init();
JDBC_MODULE_CATCH
}
=== modified file 'src/jdbc.xq.src/jsonitemsequence.cpp'
--- src/jdbc.xq.src/jsonitemsequence.cpp 2012-12-30 14:54:17 +
+++ src/jdbc.xq.src/jsonitemsequence.cpp 2013-01-30 01:14:22 +
@@ -78,17 +78,43 @@
double value = env-CallDoubleMethod(oResultSet, jResultSet.getDouble, i+1);
CHECK_EXCEPTION
aValue = itemFactory-createDouble(value);
-} else {
- jstring sValue = (jstring) env-CallObjectMethod(oResultSet, jResultSet.getString, i+1);
- CHECK_EXCEPTION
- if (sValue!=NULL) {
-const char *value = env-GetStringUTFChars(sValue, 0);
-CHECK_EXCEPTION
-aValue = itemFactory-createString(String(value));
-env-ReleaseStringUTFChars(sValue, value);
- } else {
-aValue = itemFactory-createJSONNull();
- }
+} else if (SQLTypes::isString(columnTypes[i])) {
+ jstring sValue = (jstring) env-CallObjectMethod(oResultSet, jResultSet.getString, i+1);
+ CHECK_EXCEPTION
+ if (sValue!=NULL) {
+const char *value = env-GetStringUTFChars(sValue, 0);
+CHECK_EXCEPTION
+aValue = itemFactory-createString(String(value));
+env-ReleaseStringUTFChars(sValue, value);
+ } else {
+aValue =
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Commit Message changed to: BLOB support added For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Validation queue job bug1109853-2013-01-30T03-42-05.903Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
The proposal to merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
