1. add in last of test suites txn, datatypes

Author: TimelordUK

lib/ConnectionWrapper.js

@@ -115,46 +115,23 @@ function ConnectionWrapper (driver, defCb, name)
 
     function beginTransaction(callback) {
 
-        function onBeginTxn(err) {
-            callback(err);
-            driverMgr.nextOp();
-        }
-
         callback = callback || defaultCallback;
-        var op = makeOp(function (callback) {
-            native.beginTransaction(callback)
-        }, [onBeginTxn]);
-        driverMgr.execQueueOp(op);
+
+        driverMgr.beginTransaction(callback);
     }
 
     function commit(callback) {
 
-        function onCommit(err) {
-            callback(err);
-            driverMgr.nextOp();
-        }
-
         callback = callback || defaultCallback;
 
-        var op = makeOp(function (callback) {
-            native.commit(callback);
-        }, [onCommit]);
-        driverMgr.execQueueOp(op);
+        driverMgr.commit(callback);
     }
 
     function rollback(callback) {
 
-        function onRollback(err) {
-            callback(err);
-            driverMgr.nextOp();
-        }
-
         callback = callback || defaultCallback;
 
-        var op = makeOp(function (callback) {
-            native.rollback(callback);
-        }, [onRollback]);
-        driverMgr.execQueueOp(op);
+        driverMgr.rollback(callback);
     }
 
     // inform driver to prepare the sql statement and reserve it for repeated use with parameters.
@@ -229,13 +206,9 @@ function ConnectionWrapper (driver, defCb, name)
         function onPrepare(err, meta) {
             var prepared = new PreparedStatement(driverMgr, queryOrObj.query_str, inst, notify, meta);
             chunky.callback(err, prepared);
-            driverMgr.nextOp();
         }
 
-        var op = makeOp(function (callback) {
-            driverMgr.prepare(notify, queryOrObj, callback);
-        }, [onPrepare]);
-        driverMgr.execQueueOp(op);
+        driverMgr.prepare(notify, queryOrObj, onPrepare);
 
         return notify;
     }

lib/driverMgr.js

@@ -107,7 +107,7 @@ function DriverMgr(sql, queue) {
         execQueueOp(op);
     }
 
-    function prepare(notify, queryOrObj, callback) {
+    function prepareQuery(notify, queryOrObj, callback) {
         native.prepare(notify.getQueryId(), queryOrObj, callback);
     }
 
@@ -489,6 +489,61 @@ function DriverMgr(sql, queue) {
         execQueueOp(op);
     }
 
+    function beginTransaction(callback) {
+
+        function onBegin(err) {
+            callback(err);
+            nextOp();
+        }
+
+        var op = makeOp(function (cb) {
+            native.beginTransaction(cb)
+        }, [onBegin]);
+        execQueueOp(op);
+    }
+
+    function rollback(callback) {
+
+        function onRollback(err) {
+            callback(err);
+            nextOp();
+        }
+
+        var op = makeOp(function (cb) {
+            native.rollback(cb);
+        }, [onRollback]);
+        execQueueOp(op);
+    }
+
+    function commit(callback) {
+
+        function onCommit(err) {
+            callback(err);
+            nextOp();
+        }
+
+        var op = makeOp(function (cb) {
+            native.commit(cb);
+        }, [onCommit]);
+        execQueueOp(op);
+    }
+
+    function prepare(notify, queryOrObj, callback) {
+
+        function onPrepare(err, meta) {
+            callback(err, meta);
+            nextOp();
+        }
+
+        var op = makeOp(function (cb) {
+            prepareQuery(notify, queryOrObj, cb);
+        }, [onPrepare]);
+        execQueueOp(op);
+    }
+
+    this.commit = commit;
+    this.rollback = rollback;
+    this.beginTransaction = beginTransaction;
     this.prepare = prepare;
     this.routeStatementError = routeStatementError;
     this.nextOp = nextOp;

test/concurrent.js

@@ -1,30 +1,37 @@
-var sql = require('../'),
-    assert = require('assert'),
+var assert = require('assert'),
     supp = require('../demo-support'),
-    config = require('./test-config'),
     fs = require('fs');
 
 suite('concurrent', function () {
 
     var theConnection;
-    this.timeout(20 * 1000);
-    var support = new supp.DemoSupport(sql, conn_str);
-    var async = new support.Async();
-    var conn_str = config.conn_str;
+    this.timeout(20000);
+    var conn_str;
+    var support;
+    var async;
+    var helper;
+
+    var sql = global.native_sql;
 
     setup(function (test_done) {
-        sql.open(conn_str, function (err, conn) {
-            theConnection = conn;
-            assert.ifError(err);
-            assert.ifError(err);
-            test_done();
-        });
+        supp.GlobalConn.init(sql, function(co) {
+            conn_str = co.conn_str;
+            support = co.support;
+            async = co.async;
+            helper =  co.helper;
+            helper.setVerbose(false);
+            sql.open(conn_str, function (err, new_conn) {
+                assert.ifError(err);
+                theConnection = new_conn;
+                test_done();
+            });
+        })
     });
 
     teardown(function (done) {
-        theConnection.close(function () {
+        theConnection.close(function() {
             done();
-        })
+        });
     });
 
     var open = function (done) {

test/datatypes.js

@@ -16,39 +16,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //---------------------------------------------------------------------------------------------------------------------------------
-var sql = require('../');
 var assert = require('assert');
-var config = require('./test-config');
 var commonTestFns = require('./CommonTestFunctions');
 var util = require('util');
 var supp = require('../demo-support');
 
 suite('datatypes', function () {
-        var theConnection;
-        var tablename = "types_table";
-        var testname = 'not set yet';
-        this.timeout(45000);
-        var conn_str = config.conn_str;
-        var support = new supp.DemoSupport(sql, conn_str);
-        var async = new support.Async();
-
-        setup(function (test_done) {
-            commonTestFns.debugComments("\ncalling sql.open(...) with conn_str= \" " + conn_str + "\" \n");
+    var tablename = "types_table";
+    var testname = 'not set yet';
+
+    var theConnection;
+    this.timeout(20000);
+    var conn_str;
+    var support;
+    var async;
+    var helper;
+    var driver;
+
+    var sql = global.native_sql;
+
+    setup(function (test_done) {
+        supp.GlobalConn.init(sql, function(co) {
+            conn_str = co.conn_str;
+            driver = co.driver;
+            support = co.support;
+            async = co.async;
+            helper =  co.helper;
+            helper.setVerbose(false);
             sql.open(conn_str, function (err, new_conn) {
                 assert.ifError(err);
                 theConnection = new_conn;
                 test_done();
             });
-        });
-
-        /*
-         teardown(function (done) {
+        })
+    });
 
-         c.close(function (err) {
-         assert.ifError(err);
-         done();
-         });
-         });*/
+    teardown(function (done) {
+        theConnection.close(function() {
+            done();
+        });
+    });
 
         testname = 'test 001 - verify functionality of data type \'smalldatetime\', fetch as date';
         test(testname, function (done) {
@@ -1004,7 +1011,7 @@ suite('datatypes', function () {
                     [2, testdata2Expected]]
             };
             var tsql = "SELECT * FROM types_table ORDER BY id";
-            var expectedError = "[Microsoft][" + config.driver + "][SQL Server]Arithmetic overflow";
+            var expectedError = "[Microsoft][" + driver + "][SQL Server]Arithmetic overflow";
 
             if (commonTestFns.SKIP_FAILING_HANGING_TEST_CASES == true) {
                 done();