Merge PR345 from @doberkofler adding Bind by Position support for PL/SQL Index-by binds

Author: cjbj

src/dpi/include/dpiStmt.h

@@ -176,7 +176,9 @@ class Stmt
                                 // methods
   virtual void bind(unsigned int pos, unsigned short type, void  *buf,
                     DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen,
-                    void *data, cbtype cb = NULL ) = 0;
+                    unsigned int maxarr_len, unsigned int *curelen,
+                    void *data,
+                    cbtype cb = NULL ) = 0;
 
   virtual void bind(const unsigned char *name, int nameLen,
                     unsigned int bndpos,

src/dpi/src/dpiStmtImpl.cpp

@@ -247,6 +247,7 @@ void StmtImpl::prefetchRows (unsigned int prefetchRows)
 */
 void StmtImpl::bind (unsigned int pos, unsigned short type, void *buf,
                      DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen,
+                     unsigned int maxarr_len, unsigned int *curelen,
                      void *data, cbtype cb)
 {
   OCIBind *b = (OCIBind *)0;
@@ -257,7 +258,7 @@ void StmtImpl::bind (unsigned int pos, unsigned short type, void *buf,
                          (type == DpiRSet) ? 0 : bufSize, type,
                          (cb ? NULL : ind),
                          (cb ? NULL : bufLen),
-                         NULL, 0, NULL,
+                         NULL, maxarr_len, curelen,
                          (cb) ? OCI_DATA_AT_EXEC : OCI_DEFAULT),
            errh_);
 

src/dpi/src/dpiStmtImpl.h

@@ -77,6 +77,7 @@ class StmtImpl : public Stmt
 
   virtual void bind (unsigned int pos, unsigned short type, void *buf,
                      DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen,
+                     unsigned int maxarr_len, unsigned int *curelen,
                      void *data, cbtype cb);
 
   virtual void bind (const unsigned char *name, int nameLen, 

src/njs/src/njsConnection.cpp

@@ -1744,6 +1744,10 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
                  executeBaton->binds[index]->maxSize,
               executeBaton->binds[index]->ind,
               executeBaton->binds[index]->len,
+              (executeBaton->binds[index]->isArray) ?
+                executeBaton->binds[index]->maxArraySize : 0,
+              (executeBaton->binds[index]->isArray) ?
+                &(executeBaton->binds[index]->curArraySize ) : 0,
               (executeBaton->stmtIsReturning &&
                 executeBaton->binds[index]->isOut ) ?
                   (void *)executeBaton : NULL,

test/plsqlBinding.js

@@ -65,7 +65,7 @@ describe('43. plsqlBinding.js', function() {
       });
     })
 
-    it('43.1.1 binding PL/SQL indexed table IN', function(done) {
+    it('43.1.1 binding PL/SQL indexed table IN by name', function(done) {
       async.series([
         function(callback) {
           var proc = "CREATE OR REPLACE PACKAGE\n" +
@@ -139,7 +139,77 @@ describe('43. plsqlBinding.js', function() {
       ], done);
     });
 
-    it('43.1.2 binding PL/SQL indexed table IN OUT', function(done) {
+    it('43.1.2 binding PL/SQL indexed table IN by position', function(done) {
+      async.series([
+        function(callback) {
+          var proc = "CREATE OR REPLACE PACKAGE\n" +
+                      "oracledb_testpack\n" +
+                      "IS\n" +
+                      "  TYPE stringsType IS TABLE OF VARCHAR2(30) INDEX BY BINARY_INTEGER;\n" +
+                      "  TYPE numbersType IS TABLE OF NUMBER INDEX BY BINARY_INTEGER;\n" +
+                      "  PROCEDURE test(s IN stringsType, n IN numbersType);\n" +
+                      "END;";
+          connection.should.be.ok;
+          connection.execute(
+            proc,
+            function(err) {
+              should.not.exist(err);
+              callback();
+            }
+          );
+        },
+        function(callback) {
+          var proc = "CREATE OR REPLACE PACKAGE BODY\n" +
+                     "oracledb_testpack\n" +
+                     "IS\n" +
+                     "  PROCEDURE test(s IN stringsType, n IN numbersType)\n" +
+                     "  IS\n" +
+                     "  BEGIN\n" +
+                     "    IF (s(1) IS NULL OR s(1) <> 'John') THEN\n" +
+                     "      raise_application_error(-20000, 'Invalid s(1): \"' || s(1) || '\"');\n" +
+                     "    END IF;\n" +
+                     "    IF (s(2) IS NULL OR s(2) <> 'Doe') THEN\n" +
+                     "      raise_application_error(-20000, 'Invalid s(2): \"' || s(2) || '\"');\n" +
+                     "    END IF;\n" +
+                     "  END;\n" +
+                     "END;";
+          connection.should.be.ok;
+          connection.execute(
+            proc,
+            function(err) {
+              should.not.exist(err);
+              callback();
+            }
+          );
+        },
+        function(callback) {
+          var bindvars = [
+            {type: oracledb.STRING, dir: oracledb.BIND_IN, val: ['John', 'Doe']},
+            {type: oracledb.NUMBER, dir: oracledb.BIND_IN, val: [8, 11]}
+          ];
+          connection.execute(
+            "BEGIN oracledb_testpack.test(:1, :2); END;",
+            bindvars,
+            function(err, result) {
+              should.not.exist(err);
+              // console.log(result);
+              callback();
+            }
+          );
+        },
+        function(callback) {
+          connection.execute(
+            "DROP PACKAGE oracledb_testpack",
+            function(err) {
+              should.not.exist(err);
+              callback();
+            }
+          );
+        }
+      ], done);
+    });
+
+    it('43.1.3 binding PL/SQL indexed table IN OUT', function(done) {
       async.series([
         function(callback) {
           var proc = "CREATE OR REPLACE PACKAGE\n" +
@@ -212,7 +282,7 @@ describe('43. plsqlBinding.js', function() {
       ], done);
     });
 
-    it('43.1.3 binding PL/SQL indexed table OUT', function(done) {
+    it('43.1.4 binding PL/SQL indexed table OUT', function(done) {
       async.series([
         function(callback) {
           var proc = "CREATE OR REPLACE PACKAGE\n" +
@@ -487,9 +557,8 @@ describe('43. plsqlBinding.js', function() {
         "BEGIN oracledb_testpack.test4(:1); END;",
         bindvars,
         function(err, result) {
-          should.exist(err);
-          (err.message).should.startWith('ORA-06550');  // this causes a PL/SQL syntax error
-          should.not.exist(result);
+          should.not.exist(err);
+          should.exist(result);
           done();
         }
       );