Added driver prefix to all tests. Normalized whitespace characters in…

… tests.
kylefarris · Feb 1, 2019 · f908251 · f908251
1 parent f48556e
commit f908251
Show file tree

Hide file tree

Showing 55 changed files with 1,378 additions and 1,388 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
-#TESTS = test/mysql/*.js test/mssql/*.js
+TESTS = test/mysql/*.js test/mssql/*.js
 #TESTS = test/mssql/*.js
 #TESTS = test/mssql/04-tests-query-response.js
-TESTS = test/mssql/05-tests-multiple-queries.js
+#TESTS = test/mssql/05-tests-multiple-queries.js
 #TESTS = test/mssql/03-tests-insert.js
 test:
 	mocha --timeout 5000 --reporter spec $(TESTS)

diff --git a/drivers/mssql/query_exec.js b/drivers/mssql/query_exec.js
@@ -11,11 +11,7 @@ class QueryExec extends QueryBuilder {
 
     _exec(sql, cb) {
         if (Object.prototype.toString.call(this._connection) === Object.prototype.toString.call({})) {
-            console.log("The Query: ", sql);
             const request = new Request(sql, (err, count, results) => {
-                // console.log("Results:" , results);
-                // console.log("Count:" , count);
-
                 // Standardize some important properties
                 if (!err && results && Array.isArray(results)) {
                     if (results.length === 0) {

diff --git a/test/05-multiple-drivers.js b/test/05-multiple-drivers.js
diff --git a/test/mssql/00-AA-tests-general.js b/test/mssql/00-AA-tests-general.js
@@ -1,6 +1,6 @@
 const should = require('chai').should();
 
-describe('QueryBuilder', () => {
+describe('MSSQL: QueryBuilder', () => {
     it('actually exists and can be initialized', () => {
         const QueryBuilder = require('../../drivers/mssql/query_builder.js');
         const qb = new QueryBuilder();

diff --git a/test/mssql/00-tests-adapter.js b/test/mssql/00-tests-adapter.js
@@ -34,7 +34,7 @@ const connection_released = qb => {
     }, 100);
 };
 
-describe('QueryBuilder() - MS SQL Adapter', () => {
+describe('MSSQL: QueryBuilder() - Adapter', () => {
     const driver = 'mssql';
     const settings = {
         host: 'localhost',

diff --git a/test/mssql/01-tests-distinct.js b/test/mssql/01-tests-distinct.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('distinct()', () => {
+describe('MSSQL: distinct()', () => {
     it('should exist', () => {
         should.exist(qb.distinct);
     });

diff --git a/test/mssql/01-tests-from.js b/test/mssql/01-tests-from.js
@@ -2,7 +2,7 @@ const should = require('chai').should();
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('from()', () => {
+describe('MSSQL: from()', () => {
     it('should exist', () => {
         should.exist(qb.from);
     });

diff --git a/test/mssql/01-tests-get.js b/test/mssql/01-tests-get.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('get()', () => {
+describe('MSSQL: get()', () => {
     it('should exist', () => {
         should.exist(qb.get);
     });
@@ -90,7 +90,7 @@ describe('get()', () => {
     it('should accept a limit on the number of rows selected', () => {
         qb.reset_query();
         const sql = qb.limit(20).get('galaxies');
-        sql.should.eql("SELECT TOP 20 * FROM [galaxies]");
+        sql.should.eql("SELECT TOP (20) * FROM [galaxies]");
     });
     it('should accept a LIMIT on the number of rows to select and an OFFSET at which to start selecting the rows', () => {
         qb.reset_query();
@@ -153,7 +153,7 @@ describe('get()', () => {
     });
 });
 
-describe('get_where()', () => {
+describe('MSSQL: get_where()', () => {
     it('should exist', () => {
         should.exist(qb.get_where);
     });

diff --git a/test/mssql/01-tests-groupby.js b/test/mssql/01-tests-groupby.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('group_by()', () => {
+describe('MSSQL: group_by()', () => {
     it('should exist', () => {
         should.exist(qb.group_by);
     });

diff --git a/test/mssql/01-tests-having.js b/test/mssql/01-tests-having.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('having()', () => {
+describe('MSSQL: having()', () => {
     it('should exist', () => {
         should.exist(qb.having);
     });
@@ -92,7 +92,7 @@ describe('having()', () => {
     });
 });
 
-describe('or_having()', () => {
+describe('MSSQL: or_having()', () => {
     it('should exist', () => {
         should.exist(qb.or_having);
     });

diff --git a/test/mssql/01-tests-join.js b/test/mssql/01-tests-join.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('join()', () => {
+describe('MSSQL: join()', () => {
     it('should exist', () => {
         should.exist(qb.join);
     });

diff --git a/test/mssql/01-tests-like.js b/test/mssql/01-tests-like.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('like()', () => {
+describe('MSSQL: like()', () => {
     it('should exist', () => {
         should.exist(qb.like);
     });
@@ -103,7 +103,7 @@ describe('like()', () => {
     });
 });
 
-describe('or_like()', () => {
+describe('MSSQL: or_like()', () => {
     it('should exist', () => {
         should.exist(qb.or_like);
     });
@@ -128,7 +128,7 @@ describe('or_like()', () => {
     });
 });
 
-describe('not_like()', () => {
+describe('MSSQL: not_like()', () => {
     it('should exist', () => {
         should.exist(qb.not_like);
     });
@@ -158,7 +158,7 @@ describe('not_like()', () => {
     });
 });
 
-describe('or_not_like()', () => {
+describe('MSSQL: or_not_like()', () => {
     it('should exist', () => {
         should.exist(qb.or_not_like);
     });

diff --git a/test/mssql/01-tests-limit.js b/test/mssql/01-tests-limit.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('limit()', () => {
+describe('MSSQL: limit()', () => {
     it('should exist', () => {
         should.exist(qb.limit);
     });

diff --git a/test/mssql/01-tests-offset.js b/test/mssql/01-tests-offset.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('offset()', () => {
+describe('MSSQL: offset()', () => {
     it('should exist', () => {
         should.exist(qb.offset);
     });

diff --git a/test/mssql/01-tests-orderby.js b/test/mssql/01-tests-orderby.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('order_by()', () => {
+describe('MSSQL: order_by()', () => {
     it('should exist', () => {
         should.exist(qb.order_by);
     });

diff --git a/test/mssql/01-tests-returning.js b/test/mssql/01-tests-returning.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('returning()', () => {
+describe('MSSQL: returning()', () => {
     it('should exist', () => {
         should.exist(qb.returning);
     });

diff --git a/test/mssql/01-tests-select.js b/test/mssql/01-tests-select.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('select()', () => {
+describe('MSSQL: select()', () => {
     it('should exist', () => {
         should.exist(qb.select);
     });
@@ -191,7 +191,7 @@ describe('select()', () => {
 const prefixes = ['min','max','avg','sum'];
 for (const i in prefixes) {
     const type = prefixes[i];
-    describe('select_' + type+'()', () => {
+    describe('MSSQL: select_' + type+'()', () => {
         it('should exist', () => {
             should.exist(qb['select_' + type]);
         });

diff --git a/test/mssql/01-tests-set.js b/test/mssql/01-tests-set.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('set()', () => {
+describe('MSSQL: set()', () => {
     it('should exist', () => {
         should.exist(qb.set);
     });

diff --git a/test/mssql/01-tests-where.js b/test/mssql/01-tests-where.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('where()', () => {
+describe('MSSQL: where()', () => {
     it('should exist', () => {
         should.exist(qb.where);
     });
@@ -148,7 +148,7 @@ describe('where()', () => {
     });
 });
 
-describe('or_where()', () => {
+describe('MSSQL: or_where()', () => {
     it('should exist', () => {
         should.exist(qb.or_where);
     });

diff --git a/test/mssql/01-tests-where_in.js b/test/mssql/01-tests-where_in.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('where_in()', () => {
+describe('MSSQL: where_in()', () => {
     it('should exist', () => {
         should.exist(qb.where_in);
     });
@@ -76,7 +76,7 @@ describe('where_in()', () => {
     });
 });
 
-describe('where_not_in()', () => {
+describe('MSSQL: where_not_in()', () => {
     it('should exist', () => {
         should.exist(qb.where_not_in);
     });
@@ -111,7 +111,7 @@ describe('where_not_in()', () => {
     });
 });
 
-describe('or_where_in()', () => {
+describe('MSSQL: or_where_in()', () => {
     it('should exist', () => {
         should.exist(qb.or_where_in);
     });
@@ -141,7 +141,7 @@ describe('or_where_in()', () => {
     });
 });
 
-describe('or_where_not_in()', () => {
+describe('MSSQL: or_where_not_in()', () => {
     it('should exist', () => {
         should.exist(qb.or_where_in);
     });

diff --git a/test/mssql/02-tests-compilation_methods.js b/test/mssql/02-tests-compilation_methods.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('get_compiled_select()', () => {
+describe('MSSQL: get_compiled_select()', () => {
     it('should exist', () => {
         should.exist(qb.get_compiled_select);
     });
@@ -27,7 +27,7 @@ describe('get_compiled_select()', () => {
     });
 });
 
-describe('get_compiled_insert()', () => {
+describe('MSSQL: get_compiled_insert()', () => {
     it('should exist', () => {
         should.exist(qb.get_compiled_insert);
     });
@@ -41,7 +41,7 @@ describe('get_compiled_insert()', () => {
     });
 });
 
-describe('get_compiled_update()', () => {
+describe('MSSQL: get_compiled_update()', () => {
     it('should exist', () => {
         should.exist(qb.get_compiled_update);
     });
@@ -55,7 +55,7 @@ describe('get_compiled_update()', () => {
     });
 });
 
-describe('get_compiled_delete()', () => {
+describe('MSSQL: get_compiled_delete()', () => {
     it('should exist', () => {
         should.exist(qb.get_compiled_delete);
     });

diff --git a/test/mssql/03-tests-count.js b/test/mssql/03-tests-count.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('count()', () => {
+describe('MSSQL: count()', () => {
     it('should exist', () => {
         should.exist(qb.count);
     });

diff --git a/test/mssql/03-tests-delete.js b/test/mssql/03-tests-delete.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('delete()', () => {
+describe('MSSQL: delete()', () => {
     it('should exist', () => {
         should.exist(qb.delete);
     });
@@ -81,7 +81,7 @@ describe('delete()', () => {
     it('should accept a limit on the number of rows deleted', () => {
         qb.reset_query();
         const sql = qb.limit(20).delete('galaxies');
-        sql.should.eql("DELETE TOP 20 FROM [galaxies]");
+        sql.should.eql("DELETE TOP (20) FROM [galaxies]");
     });
     it('should not a allow an offset delete', () => {
         qb.reset_query();

diff --git a/test/mssql/03-tests-empty_table.js b/test/mssql/03-tests-empty_table.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('emtpy_table()', () => {
+describe('MSSQL: emtpy_table()', () => {
     it('should exist', () => {
         should.exist(qb.empty_table);
     });

diff --git a/test/mssql/03-tests-insert.js b/test/mssql/03-tests-insert.js
@@ -8,7 +8,7 @@ const test_data_set = [{id:3, name:'Milky Way', type: 'spiral'}, {id:4, name: 'A
 
 // table, data, callback, ignore, suffix
 
-describe('insert()', () => {
+describe('MSSQL: insert()', () => {
     it('should exist', () => {
         should.exist(qb.insert);
     });
@@ -131,7 +131,7 @@ describe('insert()', () => {
     });
 });
 
-describe('insert_ignore()', () => {
+describe('MSSQL: insert_ignore()', () => {
     it('should exist', () => {
         should.exist(qb.insert_ignore);
     });

diff --git a/test/mssql/03-tests-insert_batch.js b/test/mssql/03-tests-insert_batch.js
@@ -6,7 +6,7 @@ const qb = new QueryBuilder();
 const test_where = {id:3};
 const test_data = [{id:3, name:'Milky Way', type: 'spiral'}, {id:4, name: 'Andromeda', type: 'spiral'}];
 
-describe('insert_batch()', () => {
+describe('MSSQL: insert_batch()', () => {
     it('should exist', () => {
         should.exist(qb.insert_batch);
     });

diff --git a/test/mssql/03-tests-truncate.js b/test/mssql/03-tests-truncate.js
@@ -3,7 +3,7 @@ const expect = require('chai').expect;
 const QueryBuilder = require('../../drivers/mssql/query_builder.js');
 const qb = new QueryBuilder();
 
-describe('truncate()', () => {
+describe('MSSQL: truncate()', () => {
     it('should exist', () => {
         should.exist(qb.truncate);
     });

diff --git a/test/mssql/03-tests-update.js b/test/mssql/03-tests-update.js
@@ -9,7 +9,7 @@ const test_data_set = [{id:3, name:'Milky Way', type: 'spiral'}, {id:4, name: 'A
 
 // table, data, callback, ignore, suffix
 
-describe('update()', () => {
+describe('MSSQL: update()', () => {
     it('should exist', () => {
         should.exist(qb.update);
     });
@@ -121,6 +121,6 @@ describe('update()', () => {
     it('should allow for a LIMITed update', () => {
         qb.reset_query();
         const sql = qb.limit(10).update('galaxies', test_data, test_where);
-        sql.should.eql("UPDATE [t] SET [name] = 'Milky Way', [type] = 'spiral' FROM (SELECT TOP 10 * FROM [galaxies] WHERE [id] = 3) [t]");
+        sql.should.eql("UPDATE [t] SET [name] = 'Milky Way', [type] = 'spiral' FROM (SELECT TOP (10) * FROM [galaxies] WHERE [id] = 3) [t]");
     });
 });