Fixed intermittent crash while setting fetchAsString, and incorrect output while reading the value.

Author: cjbj

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## node-oracledb v1.2.0 (DD Mon YYYY)
 
+- Fixed intermittent crash while setting `fetchAsString`, and incorrect output while reading the value.
+
 - Changed write-only attributes to allow console.log() on Connection objects. Note the attribute values will show as null; refer to the documentation.
 
 - Remove non-portable memory allocation for queries that return NULL.

src/njs/src/njsOracle.cpp

@@ -101,6 +101,8 @@ Oracledb::~Oracledb()
   if ( fetchAsStringTypes_ )
   {
     free ( fetchAsStringTypes_ );
+    fetchAsStringTypes_ = NULL ;
+    fetchAsStringTypesCount_ = 0;
   }
 
   if (this->dpienv_)
@@ -557,11 +559,8 @@ NAN_PROPERTY_GETTER(Oracledb::GetFetchAsString)
 
   if ( oracledb->fetchAsStringTypes_ )
   {
-    unsigned int nCount = sizeof ( oracledb->fetchAsStringTypes_ ) / 
-                   sizeof ( oracledb->fetchAsStringTypes_[0] ) ;
-    
-    typeArray = NanNew<v8::Array>( nCount );
-    for ( unsigned int t = 0; t < nCount ; t ++ )
+    typeArray = NanNew<v8::Array>( oracledb->fetchAsStringTypesCount_ );
+    for ( unsigned int t = 0; t < oracledb->fetchAsStringTypesCount_ ; t ++ )
     {
       typeArray->Set (t, NanNew<v8::Integer>(oracledb->fetchAsStringTypes_[t]));
     }
@@ -596,14 +595,17 @@ NAN_SETTER(Oracledb::SetFetchAsString)
     {
       free ( oracledb->fetchAsStringTypes_ ) ;
       oracledb->fetchAsStringTypesCount_ = 0 ;
-      return;
+      oracledb->fetchAsStringTypes_ = NULL ;
     }
+    return;
   }
 
   // If already defined, clear the array.
   if ( oracledb->fetchAsStringTypes_ )
   {
     free ( oracledb->fetchAsStringTypes_ );
+    oracledb->fetchAsStringTypes_ = NULL ;
+    oracledb->fetchAsStringTypesCount_ = 0 ;
   }
 
   oracledb->fetchAsStringTypesCount_ = array->Length ();

test/connection.js

@@ -248,14 +248,14 @@ describe('1. connection.js', function(){
       );
     })
 
-    it('1.2.3 can set maxRows to be 0', function(done){
+    it.only('1.2.3 can not set maxRows to be 0', function(done){
       connection.should.be.ok;
       connection.execute(
         "SELECT * FROM oracledb_employees", 
         {}, { maxRows: 0 },
         function(err, result){
           should.exist(err);
-          err.message.should.startWith('NJS-026:');
+          err.message.should.startWith('NJS-026:');  // NJS-026: maxRows must be greater than zero
           done();
         }
       );

test/list.txt

@@ -7,7 +7,7 @@
     1.2 limits the number of rows fetched
         1.2.1 by default, the number is 100
         1.2.2 can also specify for each execution
-        1.2.3 can set maxRows to be 0
+        1.2.3 can not set maxRows to be 0
         1.2.4 cannot set maxRows to be a negative number
         1.2.5 sets maxRows to be very large value
     1.3 can call PL/SQL procedures
@@ -411,10 +411,15 @@
       - 55.12.1 should work
 
 56. fetchAs.js
-    56.1 FetchAs - DATE type as STRING
-    56.2 FetchAs NUMBER & DATE type as STRING
-    56.3 FetchAs Oracledb property by-type
-    56.4 FetchAs override oracledb by-type (for DATE) at execute time
+    56.1 property value check
+    56.2 Fetch DATE column values as STRING - by-Column name
+    56.3 Fetch DATE, NUMBER column values STRING - by Column-name
+    56.4 Fetch DATE, NUMBER as STRING by-time configuration and by-name
+    56.5 Fetch DATE, NUMBER column as STRING by-type and override at execute time
+    56.6 Fetch ROWID column values STRING - non-ResultSet
+    56.7 Fetch ROWID column values STRING - ResultSet
+    56.8 large numbers with fetchInfo
+    56.9 large numbers with setting fetchAsString property
 
 57. nestedCursor.js
     57.1 testing nested cursor support - result set
@@ -442,7 +447,8 @@
         58.2.4 poolTimeout
         58.2.5 stmtCacheSize
     58.3 connection properties
-        58.3.1 stmtCacheSize
-        58.3.2 clientId
-        58.3.3 action
-        58.3.4 module
+        58.3.1 Connection object intial toString values
+        58.3.2 stmtCacheSize
+        58.3.3 clientId
+        58.3.4 action
+        58.3.5 module

test/properties.js

@@ -39,7 +39,7 @@ var should = require('should');
 var async = require('async');
 var dbConfig = require('./dbConfig.js');
 
-describe.skip('58. properties.js', function() {
+describe('58. properties.js', function() {
 
   if(dbConfig.externalAuth){
     var credential = { externalAuth: true, connectString: dbConfig.connectString };
@@ -66,10 +66,6 @@ describe.skip('58. properties.js', function() {
       defaultValues.outFormat       = oracledb.outFormat;
       defaultValues.lobPrefetchSize = oracledb.lobPrefetchSize;    
 
-      console.log("default fetchAsString value: ", defaultValues.fetchAsString);
-      console.log("default type of fetchAsString", typeof (defaultValues.fetchAsString) ) ;  
-      console.log("original value of fetchAsString: ", oracledb.fetchAsString);
-      console.log("original type of fetchAsString: ", typeof (oracledb.fetchAsString) );
       /* 
        * lobPrefetchSize property is currently disabled. 
        * Resetting it to default will lead to uncaught error "NJS-021: invalid type for conversion specified" 
@@ -90,9 +86,6 @@ describe.skip('58. properties.js', function() {
       oracledb.fetchAsString    = defaultValues.fetchAsString;  
       oracledb.outFormat        = defaultValues.outFormat;      
       oracledb.lobPrefetchSize  = defaultValues.lobPrefetchSize;
-
-      console.log("at last, fetchAsString value", oracledb.fetchAsString);
-      console.log("at last, type of fetchAsString", typeof oracledb.fetchAsString);
     })
 
     it('58.1.1 poolMin', function() {
@@ -301,7 +294,17 @@ describe.skip('58. properties.js', function() {
       });
     })
 
-    it('58.3.1 stmtCacheSize', function() {
+    it('58.3.1 Connection object intial toString values', function() {
+      connection.should.be.an.Object;
+
+      should.equal(connection.action, null);
+      should.equal(connection.module, null);
+      should.equal(connection.clientId, null);
+
+      (connection.stmtCacheSize).should.be.a.Number.and.be.above(0);
+    })
+
+    it('58.3.2 stmtCacheSize', function() {
       var t = connection.stmtCacheSize;
       t.should.be.a.Number;
 
@@ -313,7 +316,7 @@ describe.skip('58. properties.js', function() {
       }
     })
 
-    it('58.3.2 clientId', function() {
+    it('58.3.3 clientId', function() {
 
       try {
         var t = connection.clientId;
@@ -332,7 +335,7 @@ describe.skip('58. properties.js', function() {
       connection.clientId = "103.3";
     })
 
-    it('58.3.3 action', function() {
+    it('58.3.4 action', function() {
 
       try {
         var t = connection.action;
@@ -351,7 +354,7 @@ describe.skip('58. properties.js', function() {
       connection.action = "103.3 action";
     })
 
-    it('58.3.4 module', function() {
+    it('58.3.5 module', function() {
 
       try {
         var t = connection.module;