Merge pull request #23 from dirkmc/master

Use local as default timezone, pass timezone to escapeVal()
dresende · Sep 6, 2013 · 718090a · 718090a
2 parents ab2b7d2 + d03cf05
commit 718090a
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 32 deletions.
diff --git a/lib/Dialects/mysql.js b/lib/Dialects/mysql.js
@@ -25,11 +25,11 @@ exports.escapeVal = function (val, timeZone) {
 	}
 
 	if (Array.isArray(val)) {
-		return arrayToList(val, timeZone || "Z");
+		return arrayToList(val, timeZone || "local");
 	}
 
 	if (util.isDate(val)) {
-		val = dateToString(val, timeZone || "Z");
+		val = dateToString(val, timeZone || "local");
 	} else {
 		switch (typeof val) {
 			case 'boolean':

diff --git a/lib/Insert.js b/lib/Insert.js
@@ -2,7 +2,7 @@ var Set = require("./Set");
 
 exports.InsertQuery = InsertQuery;
 
-function InsertQuery(Dialect) {
+function InsertQuery(Dialect, opts) {
 	var sql = {};
 
 	return {
@@ -23,7 +23,7 @@ function InsertQuery(Dialect) {
 			if (sql.hasOwnProperty("set")) {
 				for (var k in sql.set) {
 					cols.push(Dialect.escapeId(k));
-					vals.push(Dialect.escapeVal(sql.set[k]));
+					vals.push(Dialect.escapeVal(sql.set[k], opts.timezone));
 				}
 				query.push("(" + cols.join(", ") + ")");
 				query.push("VALUES (" + vals.join(", ") + ")");

diff --git a/lib/Query.js b/lib/Query.js
@@ -27,16 +27,16 @@ function Query(opts) {
 		escapeId  : Dialect.escapeId.bind(Dialect),
 		escapeVal : Dialect.escapeVal.bind(Dialect),
 		select: function () {
-			return new SelectQuery(Dialect);
+			return new SelectQuery(Dialect, opts);
 		},
 		insert: function () {
-			return new InsertQuery(Dialect);
+			return new InsertQuery(Dialect, opts);
 		},
 		update: function () {
-			return new UpdateQuery(Dialect);
+			return new UpdateQuery(Dialect, opts);
 		},
 		remove: function () {
-			return new RemoveQuery(Dialect);
+			return new RemoveQuery(Dialect, opts);
 		}
 	};
 }

diff --git a/lib/Remove.js b/lib/Remove.js
@@ -2,7 +2,7 @@ var Where = require("./Where");
 
 exports.RemoveQuery = RemoveQuery;
 
-function RemoveQuery(Dialect) {
+function RemoveQuery(Dialect, opts) {
 	var sql = {
 		where : [],
 		order : []
@@ -28,7 +28,7 @@ function RemoveQuery(Dialect) {
 			query.push("DELETE FROM");
 			query.push(Dialect.escapeId(sql.table));
 
-			query = query.concat(Where.build(Dialect, sql.where));
+			query = query.concat(Where.build(Dialect, sql.where, opts));
 
 			// order
 			if (sql.order.length > 0) {

diff --git a/lib/Select.js b/lib/Select.js
@@ -10,7 +10,7 @@ var aggregate_functions = [
 
 exports.SelectQuery = SelectQuery;
 
-function SelectQuery(Dialect) {
+function SelectQuery(Dialect, opts) {
 	var sql = {
 		from         : [],
 		where        : [],
@@ -253,7 +253,7 @@ function SelectQuery(Dialect) {
 							if (typeof el.type == "function") {
 								switch (el.type()) {
 									case "text":
-										return Dialect.escapeVal(el.data);
+										return Dialect.escapeVal(el.data, opts.timezone);
 									default:
 										return el;
 								}
@@ -337,7 +337,7 @@ function SelectQuery(Dialect) {
 				}
 			}
 
-			query = query.concat(Where.build(Dialect, sql.where));
+			query = query.concat(Where.build(Dialect, sql.where, opts));
 
 			if (sql.group_by !== null) {
 				query.push("GROUP BY " + sql.group_by.map(function (column) {

diff --git a/lib/Set.js b/lib/Set.js
@@ -1,4 +1,6 @@
-exports.build = function (Dialect, set) {
+exports.build = function (Dialect, set, opts) {
+	opts = opts || {};
+
 	if (!set || set.length === 0) {
 		return [];
 	}
@@ -9,7 +11,7 @@ exports.build = function (Dialect, set) {
 		query.push(
 			Dialect.escapeId(k) +
 			" = " +
-			Dialect.escapeVal(set[k])
+			Dialect.escapeVal(set[k], opts.timezone)
 		);
 	}
 

diff --git a/lib/Update.js b/lib/Update.js
@@ -3,7 +3,7 @@ var Where = require("./Where");
 
 exports.UpdateQuery = UpdateQuery;
 
-function UpdateQuery(Dialect) {
+function UpdateQuery(Dialect, opts) {
 	var sql = {
 		where : []
 	};
@@ -32,8 +32,8 @@ function UpdateQuery(Dialect) {
 			query.push("UPDATE");
 			query.push(Dialect.escapeId(sql.table));
 
-			query = query.concat(Set.build(Dialect, sql.set));
-			query = query.concat(Where.build(Dialect, sql.where));
+			query = query.concat(Set.build(Dialect, sql.set, opts));
+			query = query.concat(Where.build(Dialect, sql.where, opts));
 
 			return query.join(" ");
 		}

diff --git a/lib/Where.js b/lib/Where.js
@@ -1,14 +1,14 @@
 var Helpers = require('./Helpers');
 
-exports.build = function (Dialect, where) {
+exports.build = function (Dialect, where, opts) {
 	if (where.length === 0) {
 		return [];
 	}
 
 	var query = [], subquery;
 
 	for (var i = 0; i < where.length; i++) {
-		subquery = buildOrGroup(Dialect, where[i]);
+		subquery = buildOrGroup(Dialect, where[i], opts);
 
 		if (subquery !== false) {
 			query.push(subquery);
@@ -24,7 +24,9 @@ exports.build = function (Dialect, where) {
 	return "WHERE (" + query.join(") AND (") + ")";
 };
 
-function buildOrGroup(Dialect, where) {
+function buildOrGroup(Dialect, where, opts) {
+	opts = opts || {};
+
 	if (where.e) {
 	    // EXISTS
 
@@ -41,7 +43,7 @@ function buildOrGroup(Dialect, where) {
 			"EXISTS (" +
 			"SELECT * FROM " + Dialect.escapeId(where.e.t) + " " +
 			"WHERE " + wheres.join(" AND ") + " " +
-			"AND " + buildOrGroup(Dialect, { t: null, w: where.w }) +
+			"AND " + buildOrGroup(Dialect, { t: null, w: where.w }, opts) +
             ")"
 		];
 	}
@@ -64,7 +66,7 @@ function buildOrGroup(Dialect, where) {
 			op = (k == "not" ? "and" : (k.indexOf("_") >= 0 ? k.substr(4) : k)).toUpperCase();
 
 			for (var j = 0; j < where.w[k].length; j++) {
-				q = buildOrGroup(Dialect, { t: where.t, w: where.w[k][j] });
+				q = buildOrGroup(Dialect, { t: where.t, w: where.w[k][j] }, opts);
 				if (q !== false) {
 					subquery.push(q);
 				}
@@ -84,25 +86,25 @@ function buildOrGroup(Dialect, where) {
 					query.push(
 						buildComparisonKey(Dialect, where.t, k) +
 						" BETWEEN " +
-						Dialect.escapeVal(where.w[k].from) +
+						Dialect.escapeVal(where.w[k].from, opts.timezone) +
 						" AND " +
-						Dialect.escapeVal(where.w[k].to)
+						Dialect.escapeVal(where.w[k].to, opts.timezone)
 					);
 					break;
 				case "not_between":
 					query.push(
 						buildComparisonKey(Dialect, where.t, k) +
 						" NOT BETWEEN " +
-						Dialect.escapeVal(where.w[k].from) +
+						Dialect.escapeVal(where.w[k].from, opts.timezone) +
 						" AND " +
-						Dialect.escapeVal(where.w[k].to)
+						Dialect.escapeVal(where.w[k].to, opts.timezone)
 					);
 					break;
 				case "like":
 					query.push(
 						buildComparisonKey(Dialect, where.t, k) +
 						" LIKE " +
-						Dialect.escapeVal(where.w[k].expr)
+						Dialect.escapeVal(where.w[k].expr, opts.timezone)
 					);
 					break;
 				case "eq":
@@ -122,7 +124,7 @@ function buildOrGroup(Dialect, where) {
 					query.push(
 						buildComparisonKey(Dialect, where.t, k) +
 						" " + op + " " +
-						Dialect.escapeVal(where.w[k].val)
+						Dialect.escapeVal(where.w[k].val, opts.timezone)
 					);
 					break;
 				case "sql":
@@ -138,7 +140,7 @@ function buildOrGroup(Dialect, where) {
 								return Dialect.escapeId(where.w[k].where.escapes.shift());
 							}
 							// ?:value
-							return Dialect.escapeVal(where.w[k].where.escapes.shift());
+							return Dialect.escapeVal(where.w[k].where.escapes.shift(), opts.timezone);
 						});
 
 						query.push(sql);
@@ -158,10 +160,10 @@ function buildOrGroup(Dialect, where) {
 					// #274: IN with empty arrays should be a false sentence
 					query.push("FALSE");
 				} else {
-					query.push(buildComparisonKey(Dialect, where.t, k) + " IN " + Dialect.escapeVal(where.w[k]));
+					query.push(buildComparisonKey(Dialect, where.t, k) + " IN " + Dialect.escapeVal(where.w[k], opts.timezone));
 				}
 			} else {
-				query.push(buildComparisonKey(Dialect, where.t, k) + " = " + Dialect.escapeVal(where.w[k]));
+				query.push(buildComparisonKey(Dialect, where.t, k) + " = " + Dialect.escapeVal(where.w[k], opts.timezone));
 			}
 		}
 	}

diff --git a/test/integration/test-dialect-mysql.js b/test/integration/test-dialect-mysql.js
@@ -66,3 +66,29 @@ assert.equal(
 	dialect.escapeVal(false),
 	"false"
 );
+
+
+// Dates and Timezones
+var d = new Date(1378322111133);
+var tzOffsetMillis = (d.getTimezoneOffset() * 60 * 1000);
+
+assert.equal(
+	dialect.escapeVal(new Date(d.getTime() + tzOffsetMillis)),
+	"'2013-09-04 19:15:11'"
+);
+assert.equal(
+	dialect.escapeVal(new Date(d.getTime()), 'Z'),
+	"'2013-09-04 19:15:11'"
+);
+assert.equal(
+	dialect.escapeVal(new Date(d.getTime()), '-0000'),
+	"'2013-09-04 19:15:11'"
+);
+assert.equal(
+	dialect.escapeVal(new Date(d.getTime()), '-0400'),
+	"'2013-09-04 15:15:11'"
+);
+assert.equal(
+	dialect.escapeVal(new Date(d.getTime())),
+	dialect.escapeVal(new Date(d.getTime()), 'local')
+);