Rewrite

Author: thiagodp

index.js

@@ -11,42 +11,77 @@ var mssql = require('mssql');
  */
 class MsSql {
 
-    constructor(pool, params) {
-        this.pool = pool;
-        this.params = params;
+    constructor( connection ) {
+        this.connection = connection;
+        this._isConnected = false;
+
+        this.pool = null;
         this.transaction = null;
         this._inTransaction = false;
     }
 
+    async _pool() {
+
+        if ( this._isConnected ) {
+            return this.pool;
+        }
+
+        var connection = this.connection;
+
+        if ('string' === typeof connection) {
+            this.pool = await mssql.connect( connection );
+            this._isConnected = true;
+            return this.pool;
+        }
+
+        var convertedConnection = {
+            server: connection.Hostname || 'localhost',
+            port: parseInt(connection.Port) || 1433,
+            database: connection.Database,
+            user: connection.Username,
+            password: connection.Password,
+            options: connection.options || {}
+        };
+
+        var config = Object.assign(
+            convertedConnection,
+            {
+                options: {
+                    abortTransactionOnError: true,
+                    encrypt: false
+                }
+            }            
+        );
+
+        this.pool = await mssql.connect( config );
+        this._isConnected = true;
+        return this.pool;        
+    }
+
     /**
      * Performs a query or data manipulation command.
      *
      * @param {string} sql
      */
-    query(sql) {
-        var request = new mssql.Request(this.pool);
-        return request.query(sql);
+    async query(sql) {
+        let pool = await this._pool();
+        let result = await pool.request().query( sql );
+        return result.recordset;
     }
 
     /**
      * Executes a data manipulation command.
      *
      * @param {string} sql
      */
-    execute(sql) {
-        return this.query(sql);
+    async execute(sql) {
+        return await this.query(sql);
     }
 
-    close() {
-        var self = this;
-        return new Promise( function closePromise(resolve, reject) {
-            try {
-                self.pool.close();
-                resolve();
-            } catch (err) {
-                reject(err);
-            }
-        });
+    async close() {
+        let pool = await this._pool();
+        await pool.close();
+        this._isConnected = false;
     }
 
     isTransactionSupported() {
@@ -57,26 +92,27 @@ class MsSql {
         return this._inTransaction;
     }
 
-    beginTransaction() {
-        if (true === this.inTransaction()) {
-            return Promise.resolve(false);
+    async beginTransaction() {
+        if ( this.inTransaction() ) {
+            false;
         }
-        this.transaction = new mssql.Transaction(this.pool);
+        let pool = await this._pool();
+        this.transaction = new mssql.Transaction( pool );
         this._inTransaction = true;
         return this.transaction.begin();
     }
 
-    commit() {
-        if (false === this.inTransaction()) {
-            return Promise.resolve(false);
+    async commit() {
+        if ( ! this.inTransaction() ) {
+            return false;
         }
         this._inTransaction = false;
         return this.transaction.commit();
     }
 
-    rollback() {
-        if (false === this.inTransaction()) {
-            return Promise.resolve(false);
+    async rollback() {
+        if ( ! this.inTransaction() ) {
+            return false;
         }
         this._inTransaction = false;
         return this.transaction.rollback();
@@ -85,38 +121,6 @@ class MsSql {
 
 module.exports = {
     open: function(connection) {
-
-        try { // avoid warnings
-            (async function openAsync(connection) {
-
-                if ('string' === typeof connection) {
-                    return new MsSql(await mssql.connect(connection));
-                }
-
-                var convertedConnection = {
-                    server: connection.Hostname || 'localhost',
-                    port: parseInt(connection.Port) || 1433,
-                    database: connection.Database,
-                    user: connection.Username,
-                    password: connection.Password,
-                    options: connection.options || {}
-                };
-
-                var config = Object.assign(
-                    {
-                        options: {
-                            abortTransactionOnError: true,
-                            encrypt: false
-                        }
-                    },
-                    convertedConnection
-                );
-
-                return new MsSql(await mssql.connect(config));
-            })(connection);
-
-        } catch ( err ) {
-            throw err; // rethrow
-        }
+        return new MsSql( connection );
     }
 };

readme.md

@@ -4,7 +4,7 @@
 
 !!! WARNING !!! - This library is under development and IS NOT STABLE YET.
 
-Works with MS SQL Server 2000-2017 through the  [TDS protocol](http://msdn.microsoft.com/en-us/library/dd304523.aspx).
+It a wrapper for [node-mssql](https://github.com/thiagodp/database-js-mssql.git) and works with MS SQL Server 2000-2017.
 
 
 ## Install

test/test.js

@@ -4,27 +4,20 @@ var assert = require( 'assert' );
 
 describe( 'database-js-mssql', function () {
 
-    var connStr = 'mssql:///root:123456@localhost/testdb';
+    // Change this line before testing:
+    var connStr = 'mssql://username:password@localhost/database'; 
 
-    it( 'queries an existing table correctly', function( done ) {
+    it( 'queries an existing table correctly', async function() {
         var conn;
         try {
             conn = new dbjs.Connection( connStr, driver );
         } catch ( err ) {
             assert.fail( err.message );
             return;
         }
-
-        var st = conn.prepareStatement( 'SELECT * FROM user WHERE username = ?' );
-        var search = 'alice';
-        st.query( search )
-            .then( function( data ) {
-                assert.equal( data[ 0 ].username, search );
-                done();
-            } )
-            .catch( function( err ) {
-                done( err );
-            } );
+        var st = conn.prepareStatement( 'SELECT * FROM states WHERE state = ?' );
+        var data = await st.query( 'Dakota' );
+        console.log( data );
     } );
 
 } );