Merge pull request #769 from durango/string-escape

SqlString.escape now accepts an object as an argument closes #760

lib/sql-string.js

@@ -9,17 +9,31 @@ SqlString.escapeId = function (val, forbidQualified) {
 };
 
 SqlString.escape = function(val, stringifyObjects, timeZone, dialect, field) {
+  if (arguments.length === 1 && typeof arguments[0] === "object") {
+    val = val.val || val.value || null
+    stringifyObjects = val.stringifyObjects || val.objects || undefined
+    timeZone = val.timeZone || val.zone || null
+    dialect = val.dialect || null
+    field = val.field || null
+  }
+  else if (arguments.length < 3 && typeof arguments[1] === "object") {
+    timeZone = stringifyObjects.timeZone || stringifyObjects.zone || null
+    dialect = stringifyObjects.dialect || null
+    field = stringifyObjects.field || null
+  }
+
   if (val === undefined || val === null) {
     return 'NULL';
   }
 
   switch (typeof val) {
-    case 'boolean':
-      // SQLite doesn't have true/false support. MySQL aliases true/false to 1/0
-      // for us. Postgres actually has a boolean type with true/false literals,
-      // but sequelize doesn't use it yet.
-      return dialect === 'sqlite' ? +!!val : ('' + !!val);
-    case 'number': return val+'';
+  case 'boolean':
+    // SQLite doesn't have true/false support. MySQL aliases true/false to 1/0
+    // for us. Postgres actually has a boolean type with true/false literals,
+    // but sequelize doesn't use it yet.
+    return dialect === 'sqlite' ? +!!val : ('' + !!val);
+  case 'number':
+    return val+'';
   }
 
   if (val instanceof Date) {