Add 12c row limit SQL case and LOB object test cases

Author: cjbj

test/connection.js

@@ -169,8 +169,8 @@ describe('1. connection.js', function(){
           END; \
           EXECUTE IMMEDIATE (' \
               CREATE TABLE oracledb_employees ( \
-                  employees_id NUMBER,  \
-                  employees_name VARCHAR2(20) \
+                  employee_id NUMBER,  \
+                  employee_name VARCHAR2(20) \
               ) \
           '); \
       END; "; 
@@ -286,6 +286,35 @@ describe('1. connection.js', function(){
         }  
       );
     })
+
+    it('1.2.6 shows 12c new way to limit the number of records fetched by queries', function(done) {
+      connection.should.be.ok;
+
+      var myoffset     = 2;  // number of rows to skip
+      var mymaxnumrows = 6;  // number of rows to fetch
+      var sql = "SELECT employee_id, employee_name FROM oracledb_employees ORDER BY employee_id";
+
+      if (connection.oracleServerVersion >= 1201000000) {
+        // 12c row-limiting syntax
+        sql += " OFFSET :offset ROWS FETCH NEXT :maxnumrows ROWS ONLY";
+      } else {
+        // Pre-12c syntax [could also customize the original query and use row_number()]
+        sql = "SELECT * FROM (SELECT A.*, ROWNUM AS MY_RNUM FROM"
+            + "(" + sql + ") A "
+            + "WHERE ROWNUM <= :maxnumrows + :offset) WHERE MY_RNUM > :offset";
+      }
+
+      connection.execute(
+        sql, 
+        { offset: myoffset, maxnumrows: mymaxnumrows },
+        { maxRows: 150 },
+        function(err, result) {
+          should.not.exist(err);    
+          (result.rows.length).should.eql(mymaxnumrows); 
+          done();
+        }
+      );
+    })
   })
 
   describe('1.3 can call PL/SQL procedures', function(){

test/dataTypeClob.js

@@ -27,7 +27,8 @@
  *         clobinsert1.js, clobstream1.js and clobstream2.js
  *    Firstly, reads text from clobexample.txt and INSERTs it into a CLOB column.
  *    Secondly, SELECTs a CLOB and pipes it to a file, clobstreamout.txt 
- *    Thirdly, SELECTs the CLOB and compares it with the content in clobexample.txt 
+ *    Thirdly, SELECTs the CLOB and compares it with the content in clobexample.txt.
+ *    Fourthly, query the CLOB with Object outFormat.
  *
  * NUMBERING RULE
  *   Test numbers follow this numbering rule:
@@ -49,7 +50,7 @@ var inFileName = './test/clobexample.txt';  // the file with text to be inserted
 var outFileName = './test/clobstreamout.txt';
 
 describe('40. dataTypeClob.js', function() {
-  this.timeout(10000);  
+  this.timeout(15000);  
 
   if(dbConfig.externalAuth){
     var credential = { externalAuth: true, connectString: dbConfig.connectString };
@@ -212,6 +213,43 @@ describe('40. dataTypeClob.js', function() {
                 });
               });
 
+              lob.on('error', function(err) {
+                should.not.exist(err, "lob.on 'error' event");
+              });
+            }
+          );
+        },
+        function objectOutFormat(callback) {
+          var lobEndEventFired = false;
+          var lobDataEventFired = false;
+          setTimeout( function(){
+            lobDataEventFired.should.equal(true, "lob does not call 'data' event!");
+            lobEndEventFired.should.equal(true, "lob does not call 'end' event!");
+            callback();
+          }, 2000);
+
+          connection.execute(
+            "SELECT content FROM oracledb_myclobs WHERE num = :n",
+            { n: 1 },
+            { outFormat: oracledb.OBJECT },
+            function(err, result) {
+              should.not.exist(err);
+
+              var clob = '';
+              var row = result.rows[0];
+              var lob = row['CONTENT'];
+
+              lob.setEncoding('utf8');
+
+              lob.on('data', function(chunk) {
+                lobDataEventFired = true;
+                clob += chunk;
+              });
+
+              lob.on('end', function() {
+                lobEndEventFired = true;
+              });
+
               lob.on('error', function(err) {
                 should.not.exist(err, "lob.on 'error' event");
               });

test/list.txt

@@ -503,6 +503,8 @@
     61.1 Oracledb class
     61.2 Connection class
     61.3 Lob Class
+    61.4 Pool Class
+    61.5 ResultSet Class
 
 62. lobProperties.js
     62.1 chunkSize (read-only)