From eed1f40accd73b8426d09c93576be5c0eb65a780 Mon Sep 17 00:00:00 2001 From: hallta Date: Wed, 24 Sep 2014 22:26:55 -0700 Subject: [PATCH 1/5] Removing unnecessary check for aggregates in aggreate().get --- lib/AggregateFunctions.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/AggregateFunctions.js b/lib/AggregateFunctions.js index 4ce0ce75..b6d08631 100644 --- a/lib/AggregateFunctions.js +++ b/lib/AggregateFunctions.js @@ -93,9 +93,6 @@ function AggregateFunctions(opts) { if (aggregates[aggregates.length - 1].length === 0) { aggregates.length -= 1; } - if (aggregates.length === 0) { - throw new ORMError('PARAM_MISMATCH', "Missing aggregate functions"); - } var query = opts.driver.getQuery().select().from(opts.table).select(opts.propertyList); var i, j; From 22ba2de82743a74f4f1be84fef2ee637110ce345 Mon Sep 17 00:00:00 2001 From: Trevor Hall Date: Thu, 1 Oct 2015 11:03:43 -0700 Subject: [PATCH 2/5] alter underlying mysql client implementnation and api --- lib/Drivers/DML/mysql.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js index b898a4ad..b3bc0a2c 100644 --- a/lib/Drivers/DML/mysql.js +++ b/lib/Drivers/DML/mysql.js @@ -1,5 +1,5 @@ var _ = require("lodash"); -var mysql = require("mysql"); +var mysql = require("mysql2"); var Query = require("sql-query").Query; var shared = require("./_shared"); var DDL = require("../DDL/SQL"); diff --git a/package.json b/package.json index 1b169278..8dc52290 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lodash" : "2.4.1" }, "devDependencies": { - "mysql" : "2.5.5", + "mysql2" : "0.15.8", "pg" : "4.3.0", "sqlite3" : "3.0.5", "async" : "0.9.0", From 7d41265ba6d7c947b66b988e98ddd1d8a8615be5 Mon Sep 17 00:00:00 2001 From: Trevor Hall Date: Thu, 1 Oct 2015 11:05:11 -0700 Subject: [PATCH 3/5] alter underlying mysql client implementnation and api --- lib/Drivers/DML/mysql.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js index b3bc0a2c..b898a4ad 100644 --- a/lib/Drivers/DML/mysql.js +++ b/lib/Drivers/DML/mysql.js @@ -1,5 +1,5 @@ var _ = require("lodash"); -var mysql = require("mysql2"); +var mysql = require("mysql"); var Query = require("sql-query").Query; var shared = require("./_shared"); var DDL = require("../DDL/SQL"); diff --git a/package.json b/package.json index 8dc52290..1b169278 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lodash" : "2.4.1" }, "devDependencies": { - "mysql2" : "0.15.8", + "mysql" : "2.5.5", "pg" : "4.3.0", "sqlite3" : "3.0.5", "async" : "0.9.0", From 1a820f68c5c45b3a940c57f54759a46e6aef522e Mon Sep 17 00:00:00 2001 From: Trevor Hall Date: Thu, 1 Oct 2015 11:05:35 -0700 Subject: [PATCH 4/5] Revert "alter underlying mysql client implementnation and api" This reverts commit 7d41265ba6d7c947b66b988e98ddd1d8a8615be5. --- lib/Drivers/DML/mysql.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js index b898a4ad..b3bc0a2c 100644 --- a/lib/Drivers/DML/mysql.js +++ b/lib/Drivers/DML/mysql.js @@ -1,5 +1,5 @@ var _ = require("lodash"); -var mysql = require("mysql"); +var mysql = require("mysql2"); var Query = require("sql-query").Query; var shared = require("./_shared"); var DDL = require("../DDL/SQL"); diff --git a/package.json b/package.json index 1b169278..8dc52290 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lodash" : "2.4.1" }, "devDependencies": { - "mysql" : "2.5.5", + "mysql2" : "0.15.8", "pg" : "4.3.0", "sqlite3" : "3.0.5", "async" : "0.9.0", From 6ee8b2fc96d4db49ec9aec72124d7ab8c72fe4c9 Mon Sep 17 00:00:00 2001 From: Trevor Hall Date: Thu, 1 Oct 2015 11:05:39 -0700 Subject: [PATCH 5/5] Revert "alter underlying mysql client implementnation and api" This reverts commit 22ba2de82743a74f4f1be84fef2ee637110ce345. --- lib/Drivers/DML/mysql.js | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Drivers/DML/mysql.js b/lib/Drivers/DML/mysql.js index b3bc0a2c..b898a4ad 100644 --- a/lib/Drivers/DML/mysql.js +++ b/lib/Drivers/DML/mysql.js @@ -1,5 +1,5 @@ var _ = require("lodash"); -var mysql = require("mysql2"); +var mysql = require("mysql"); var Query = require("sql-query").Query; var shared = require("./_shared"); var DDL = require("../DDL/SQL"); diff --git a/package.json b/package.json index 8dc52290..1b169278 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lodash" : "2.4.1" }, "devDependencies": { - "mysql2" : "0.15.8", + "mysql" : "2.5.5", "pg" : "4.3.0", "sqlite3" : "3.0.5", "async" : "0.9.0",