Treat OCI_SUCCESS_WITH_INFO as success (PR #250)

Author: cjbj

src/dpi/src/dpiUtils.cpp

@@ -58,7 +58,10 @@
 
 static void ociCallCommon(sword rc, void *handle, ub4 errType)
 {
-  if (!rc)
+  // OCI_SUCCESS_WITH_INFO - warnings are reported in some cases.
+  // Treat these warnings as success as the OCI call succeeded and
+  // ignore the error message
+  if ( (rc == OCI_SUCCESS) || (rc == OCI_SUCCESS_WITH_INFO ) )
     return;
 
   if (rc == OCI_INVALID_HANDLE)

src/njs/src/njsConnection.cpp

@@ -2615,24 +2615,21 @@ NAN_METHOD(Connection::Release)
   switch ( connStat )
   {
     case CONN_NOT_BUSY:
-      break;    // Nothing to do in this case
+      connection->isValid_    = false;
+      releaseBaton->dpiconn   = connection->dpiconn_;
+      break;
     case CONN_BUSY_LOB:
       releaseBaton->error = NJSMessages::getErrorMsg( errBusyConnLOB );
-      goto exitRelease;
+      break;
     case CONN_BUSY_RS:
       releaseBaton->error = NJSMessages::getErrorMsg( errBusyConnRS );
-      goto exitRelease;
+      break;
     case CONN_BUSY_DB:
       releaseBaton->error = NJSMessages::getErrorMsg( errBusyConnDB );
-      goto exitRelease;
-  
-    default:
       break;
   }
 
-  connection->isValid_    = false;
-  releaseBaton->dpiconn   = connection->dpiconn_;
-  exitRelease:
+exitRelease:
   releaseBaton->req.data  = (void*) releaseBaton;
 
   int status = uv_queue_work(uv_default_loop(), &releaseBaton->req,

src/njs/src/njsMessages.cpp

@@ -69,7 +69,7 @@ static const char *errMsg[] =
             " in progress",
   "NJS-032: Connection cannot be released because a database call is in"
             " progress",
-  "NJS-033: An internal error occurred.[%s][%s]",
+  "NJS-033: An internal error occurred. [%s][%s]",
 
 };
 

test/warning.js

@@ -0,0 +1,95 @@
+/* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. */
+
+/******************************************************************************
+ *
+ * You may not use the identified files except in compliance with the Apache
+ * License, Version 2.0 (the "License.")
+ *
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * The node-oracledb test suite uses 'mocha', 'should' and 'async'. 
+ * See LICENSE.md for relevant licenses.
+ *
+ * NAME
+ *   64. warning.js
+ *
+ * DESCRIPTION
+ *   Testing to make sure OCI_SUCCESS_WITH_INFO is treated as OCI_SUCCESS
+ *   Creating a PLSQL procedure with a SELECT query from a non-existing
+ *   table will result in warnings (OCI_SUCCESS_WITH_INFO).
+ *
+ * NUMBERING RULE
+ *   Test numbers follow this numbering rule:
+ *     1  - 20  are reserved for basic functional tests
+ *     21 - 50  are reserved for data type supporting tests
+ *     51 onwards are for other tests 
+ * 
+ *****************************************************************************/
+"use strict";
+ 
+var oracledb = require('oracledb');
+var fs       = require('fs');
+var should = require('should');
+var async = require('async');
+var dbConfig = require('./dbConfig.js');
+var assist   = require('./dataTypeAssist.js');
+
+describe('64. warning.js', function() {
+
+  if(dbConfig.externalAuth){
+    var credential = { externalAuth: true, connectString: dbConfig.connectString };
+  } else {
+    var credential = dbConfig;
+  }
+
+  describe('64.1 Success With Info', function() {
+    var connection = null;
+
+    before('get one connection', function(done) {
+      oracledb.getConnection(credential, function(err, conn) {
+        should.not.exist(err);
+        connection = conn;
+        done();
+      });
+    })
+
+    after('release connection', function(done) {
+      connection.release( function(err) {
+        should.not.exist(err);
+        done();
+      });
+    })
+
+    it('64.1 Execute SQL Statement to create PLSQL procedure with warnings',
+       function(done) {
+      connection.should.be.an.Object;
+
+      connection.execute ( 
+        "CREATE OR REPLACE PROCEDURE get_emp_rs_inout " +
+          "(p_in IN NUMBER, p_out OUT SYS_REFCURSOR ) AS " +
+          "BEGIN " +
+          "  OPEN p_out FOR SELECT * FROM oracledb_employees " +
+        "END;",
+        {
+        },
+        {
+        },
+        function ( err, result )
+        {
+          should.not.exist ( err );
+          done();
+        }
+        );
+    })
+  }) // 64.1
+
+
+})