Merge lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module

[Rodolfo Ochoa]

BLOB support added
Fixing error in documentation due line numbering

BLOB support added
Fixing error in documentation due line numbering

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-01-30T03-42-05.903Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1109853-2013-01-30T03-42-05.903Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Pending.

[Rodolfo Ochoa (rodolfo-ochoa)]

Sorry I added this later, I find out this problem when I was creating the paper.

[Chris Hillery (ceejatec)]

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?

review: Needs Fixing

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-02-02T06-04-06.016Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

[Rodolfo Ochoa (rodolfo-ochoa)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-02-02T14-49-07.197Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1109853-2013-02-03T10-46-09.123Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1109853-2013-02-03T10-46-09.123Z is finished. The final status was:

All tests succeeded!

=== modified file 'include/javaids.h'
--- include/javaids.h	2013-01-05 01:04:21 +0000
+++ include/javaids.h	2013-02-02 04:42:22 +0000
@@ -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 +0000
+++ include/jdbc.h	2013-02-02 04:42:22 +0000
@@ -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 +0000
+++ include/sqltypes.h	2013-02-02 04:42:22 +0000
@@ -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/jdbc.xq	2013-01-09 19:59:40 +0000
+++ src/jdbc.xq	2013-02-02 04:42:22 +0000
@@ -57,7 +57,7 @@
  :)
 
 (:~
- : 2.1 Opens a connection to a database.
+ : Opens a connection to a database.
  : Returns a URI identifying the connection that has been opened. The implementing code determines from the $connection-config either explicitly (interpreting the driver attribute) or implicitly (using the type attribute) which driver it has to load.
  :
  : @param $connection-config json object that has the host and user informations.
@@ -82,7 +82,7 @@
                                      $connection-config as object() ) as xs:anyURI external;
 
 (:~
- : 2.1 Opens a connection to a database with specified options.
+ : Opens a connection to a database with specified options.
  : Returns a URI identifying the connection that has been opened. The implementing code determines from the $connection-config either explicitly (interpreting the driver attribute) or implicitly (using the type attribute) which driver it has to load.
  :
  : @param $connection-config json object that has the host and user informations.
@@ -121,7 +121,7 @@
                                      $options as object()?) as xs:anyURI external;
 
 (:~
- : 2.2 Verify if a connection is still active.
+ : Verify if a connection is still active.
  :
  : @param $connection-id The identifier to the connection to be verify.
  :
@@ -134,7 +134,7 @@
                                      $connection-id as xs:anyURI) as xs:boolean external;
 
 (:~
- : 2.3 Returns a set with options for a specified connection.
+ : Returns a set with options for a specified connection.
  :
  : @param $connection-id The identifier to the connection to be verify.
  :
@@ -158,7 +158,7 @@
  :)
 
 (:~
- : 3.1 Commit current transaction from an active connection.
+ : Commit current transaction from an active connection.
  :
  : @param $connection-id The identifier to the connection to be commited.
  : 
@@ -172,7 +172,7 @@
                                       $connection-id as xs:anyURI) as empty-sequence() external;
 
 (:~
- :  3.2 Rollback the current transaction of a connection.
+ : Rollback the current transaction of a connection.
  :
  : @param $connection-id The identifier to the connection to be rollbacked.
  :
@@ -191,7 +191,7 @@
  :)
 
 (:~
- : 4.1 Executes any kind of SQL statement. 
+ : Executes any kind of SQL statement. 
  :
  : @param $connection-id The identifier to an active connection.
  : @param $sql The query string to be executed.
@@ -207,7 +207,7 @@
                                       $sql as xs:string ) as xs:anyURI external;
 
 (:~
- : 4.2 Executes non-updating SQL statements.
+ : Executes non-updating SQL statements.
  :
  : @param $connection-id The identifier to an active connection.
  : @param $sql The query string to be executed.
@@ -228,7 +228,7 @@
                                       $sql as xs:string) as object()* external;
 
 (:~
- : 4.3 Executes updating SQL statements.
+ : Executes updating SQL statements.
  :
  : @param $connection-id The identifier to an active connection.
  : @param $sql The query string to be executed.
@@ -250,7 +250,7 @@
  :)
 
 (:~
- :  5.1 Creates a prepared statement for multiple executions with diferent values.
+ :  Creates a prepared statement for multiple executions with diferent values.
  :
  : @param $connection-id The identifier to an active connection.
  : @param $sql The query string to be executed.
@@ -269,7 +269,7 @@
                                       $sql as xs:string) as xs:anyURI external;
 
 (:~
- : 5.2.1 Set the value of the designated parameter with the given value, this function will assign only numeric values.
+ : Set the value of the designated parameter with the given value, this function will assign only numeric values.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : @param $parameter-index The index from the parameter to be set.
@@ -288,7 +288,7 @@
                                       $value as xs:anyAtomicType) as empty-sequence() external;
 
 (:~
- : 5.2.2 Set the value of the designated parameter with the given value, this function will assign only string values.
+ : Set the value of the designated parameter with the given value, this function will assign only string values.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : @param $parameter-index The index from the parameter to be set.
@@ -307,7 +307,7 @@
                                       $value as xs:string) as empty-sequence() external;
 
 (:~
- : 5.2.3 Set the value of the designated parameter with the given value, this function will assign only boolean values.
+ : Set the value of the designated parameter with the given value, this function will assign only boolean values.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : @param $parameter-index The index from the parameter to be set.
@@ -326,7 +326,7 @@
                                       $value as xs:boolean) as empty-sequence() external;
 
 (:~
- : 5.2.4 Set the value of the designated parameter with the given value, this function will assign only null values if possible.
+ : Set the value of the designated parameter with the given value, this function will assign only null values if possible.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : @param $parameter-index The index from the parameter to be set.
@@ -343,7 +343,7 @@
                                       $parameter-index as xs:integer) as empty-sequence() external;
 
 (:~
- : 5.2.5 Set the value of the designated parameter with the given value, 
+ : Set the value of the designated parameter with the given value, 
  : this function will assign any value you send 
  : and it will try to cast to the correct type.
  :
@@ -364,7 +364,7 @@
                                       $value as xs:anyAtomicType) as empty-sequence() external;
 
 (:~
- : 5.3 Clears the current parameter values immediately.
+ : Clears the current parameter values immediately.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : 
@@ -378,7 +378,7 @@
                                       $prepared-statement as xs:anyURI) as empty-sequence() external;
 
 (:~
- : 5.4 Retrieves the number, types and properties of the prepared statement parameters.
+ : Retrieves the number, types and properties of the prepared statement parameters.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : 
@@ -402,7 +402,7 @@
                                       $prepared-statement as xs:anyURI) as object() external;
 
 (:~
- : 5.5 Executes SQL statements prepared with 5.1 jsql:prepare-statement with values set
+ : Executes SQL statements prepared with 5.1 jsql:prepare-statement with values set
  : and returns an identifier to a Dataset.
  :
  : @param $prepared-statement The identifier to a prepared statement.
@@ -417,7 +417,7 @@
                                       $prepared-statement as xs:anyURI) as xs:anyURI external;
 
 (:~
- : 5.6 Executes a non-updating SQL statement prepared with 5.1 jsql:prepare-statement.
+ : Executes a non-updating SQL statement prepared with 5.1 jsql:prepare-statement.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : 
@@ -435,7 +435,7 @@
                                       $prepared-statement as xs:anyURI) as object()* external;
 
 (:~
- : 5.7 Executes an updating SQL statement prepared with 5.1 jsql:prepare-statement.
+ : Executes an updating SQL statement prepared with 5.1 jsql:prepare-statement.
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : 
@@ -450,7 +450,7 @@
                                       $prepared-statement as xs:anyURI) as xs:integer external;
 
 (:~
- : 5.8 Closes and frees from memory any prepared SQL statement created with jdbc:prepare-statement
+ : Closes and frees from memory any prepared SQL statement created with jdbc:prepare-statement
  :
  : @param $prepared-statement The identifier to a prepared statement.
  : 
@@ -469,7 +469,7 @@
  :)
 
 (:~
- : 6.1 This function returns a sequence of objects representing the rows of data from a non-updating query.
+ : This function returns a sequence of objects representing the rows of data from a non-updating query.
  :
  : @param $dataset-id The identifier to a DataSet.
  : 
@@ -486,7 +486,7 @@
                                       $dataset-id as xs:anyURI) as object()* external;
 
 (:~
- : 6.2 Return the metadata of the result of a particular DataSet.
+ : Return the metadata of the result of a particular DataSet.
  :
  : @param $dataset-id The identifier to a DataSet.
  : 
@@ -517,7 +517,7 @@
                                       $dataset-id as xs:anyURI) as object() external;
 
 (:~
- : 6.3 Return the number of affected rows of a particular DataSet.
+ : Return the number of affected rows of a particular DataSet.
  :
  : @param $dataset-id The identifier to a DataSet.
  : 
@@ -531,7 +531,7 @@
                                       $dataset-id as xs:anyURI) as xs:integer external;
 
 (:~
- : 6.4 Closes and free resources from a particular DataSet.
+ : Closes and free resources from a particular DataSet.
  :
  : @param $dataset-id The identifier to a DataSet.
  : 
 
=== modified file 'src/jdbc.xq.src/connection/connectionoptions.cpp'
--- src/jdbc.xq.src/connection/connectionoptions.cpp	2012-12-27 22:13:59 +0000
+++ src/jdbc.xq.src/connection/connectionoptions.cpp	2013-02-02 04:42:22 +0000
@@ -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 +0000
+++ src/jdbc.xq.src/javaids.cpp	2013-02-02 04:42:22 +0000
@@ -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 +0000
+++ src/jdbc.xq.src/jdbc.cpp	2013-02-02 04:42:22 +0000
@@ -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 +0000
+++ src/jdbc.xq.src/jsonitemsequence.cpp	2013-02-02 04:42:22 +0000
@@ -78,7 +78,7 @@
           double value = env->CallDoubleMethod(oResultSet, jResultSet.getDouble, i+1);
           CHECK_EXCEPTION
           aValue = itemFactory->createDouble(value);
-        } else {
+        } else if (SQLTypes::isString(columnTypes[i])) {
           jstring sValue = (jstring) env->CallObjectMethod(oResultSet, jResultSet.getString, i+1);
           CHECK_EXCEPTION
           if (sValue!=NULL) {
@@ -89,6 +89,21 @@
           } else {
             aValue = itemFactory->createJSONNull();
           }
+        } else if (SQLTypes::isBLOB(columnTypes[i])) {
+          jobject oBlob = env->CallObjectMethod(oResultSet, jResultSet.getBLOB, i+1);
+          CHECK_EXCEPTION
+          if (oBlob!=NULL) {
+            jint length = env->CallIntMethod(oBlob, jBlob.length);
+            CHECK_EXCEPTION
+            jbyteArray bytes  = (jbyteArray) env->CallObjectMethod(oBlob, jBlob.getBytes, 1, length);
+            CHECK_EXCEPTION
+            const char* byteString = (const char*)(env->GetByteArrayElements(bytes, 0));
+            aValue = itemFactory->createBase64Binary(byteString, length);
+          } else {
+            aValue = itemFactory->createJSONNull();
+          } 
+        } else if (columnTypes[i]==SQLTypes::_NULL) {
+            aValue = itemFactory->createJSONNull();
         }
         elements.push_back(std::pair<zorba::Item, zorba::Item>(aKey, aValue));
       }
 
=== modified file 'src/jdbc.xq.src/sqltypes.cpp'
--- src/jdbc.xq.src/sqltypes.cpp	2012-12-24 01:58:02 +0000
+++ src/jdbc.xq.src/sqltypes.cpp	2013-02-02 04:42:22 +0000
@@ -101,13 +101,28 @@
     VARCHAR   = env->GetStaticIntField(cTypes, env->GetStaticFieldID(cTypes, "VARCHAR", "I"));
 }
 
+bool SQLTypes::isBLOB(long lType) {
+  return (
+          (lType == BINARY) || (lType == BLOB) || (lType==LONGVARBINARY) || (lType==VARBINARY) ||
+          (lType == ARRAY) || (lType == DATALINK) || (lType==JAVA_OBJECT) || (lType==OTHER) ||
+          (lType == REF)
+         );
+}
+
+bool SQLTypes::isString(long lType) {
+  return (
+          (lType == CHAR) || (lType == CLOB) || (lType == LONGVARCHAR) || (lType==LONGNVARCHAR) || 
+          (lType==NCHAR) || (lType==NCLOB) || (lType==NVARCHAR) || (lType==VARCHAR) ||
+          (lType==DATE) || (lType==TIME) || (lType==TIMESTAMP) || (lType==SQLXML) 
+          );
+}
+
 bool SQLTypes::isInt(long lType){
-  return ( (lType == INTEGER) || (lType==BIGINT) || (lType==TINYINT) || (lType==BIT) );
+  return ( (lType == INTEGER) || (lType==BIGINT) || (lType==TINYINT) || (lType==SMALLINT) || (lType==BIT) );
 }
 
 bool SQLTypes::isFloat(long lType){
   return ((lType == DECIMAL) || (lType==DOUBLE) || (lType==FLOAT) || (lType==NUMERIC) || (lType==REAL) );
 }
 
-
 }}; // namespace zorba, jdbc