Fix crash with objects and symbols

Author: dxg

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '0.8'
-  - '0.10'
-  - '0.12'
-  - 'iojs'
+  - '4'
+  - '6'
+  - '8'
+  - '10'

Changelog.md

@@ -1,3 +1,7 @@
+### v0.1.27 - 27 Jun 2018
+
+- Handle objects & symbols causing crash in driver 'escapeVal' (#54)
+
 ### v0.1.26 - 16 May 2015
 
 - Add support for SELECT TOP construct for mssql dialect for limit (#41)

lib/Dialects/mssql.js

@@ -30,7 +30,7 @@ exports.escapeId = function () {
 };
 
 exports.escapeVal = function (val, timeZone) {
-	if (val === undefined || val === null) {
+	if (val === undefined || val === null || typeof val === "symbol") {
 		return 'NULL';
 	}
 
@@ -60,6 +60,10 @@ exports.escapeVal = function (val, timeZone) {
 			return val ? 1 : 0;
 		case "function":
 			return val(exports);
+		case "string":
+			break;
+		default:
+			val = JSON.stringify(val);
 	}
 
 	return "'" + val.replace(/\'/g, "''") + "'";

lib/Dialects/mysql.js

@@ -30,7 +30,7 @@ exports.escapeId = function () {
 };
 
 exports.escapeVal = function (val, timeZone) {
-	if (val === undefined || val === null) {
+	if (val === undefined || val === null || typeof val === "symbol") {
 		return 'NULL';
 	}
 

lib/Dialects/postgresql.js

@@ -30,7 +30,7 @@ exports.escapeId = function () {
 };
 
 exports.escapeVal = function (val, timeZone) {
-	if (val === undefined || val === null) {
+	if (val === undefined || val === null || typeof val === "symbol") {
 		return 'NULL';
 	}
 
@@ -60,6 +60,10 @@ exports.escapeVal = function (val, timeZone) {
 			return val ? "true" : "false";
 		case "function":
 			return val(exports);
+		case "string":
+			break;
+		default:
+			val = JSON.stringify(val);
 	}
 	// No need to escape backslashes with default PostgreSQL 9.1+ config.
 	// Google 'postgresql standard_conforming_strings' for details.

lib/Dialects/sqlite.js

@@ -18,7 +18,7 @@ exports.escape = function (query, args) {
 exports.escapeId = require("./mysql").escapeId;
 
 exports.escapeVal = function (val, timeZone) {
-	if (val === undefined || val === null) {
+	if (val === undefined || val === null || typeof val === "symbol") {
 		return 'NULL';
 	}
 
@@ -48,6 +48,10 @@ exports.escapeVal = function (val, timeZone) {
 			return val ? 1 : 0;
 		case "function":
 			return val(exports);
+		case "string":
+			break;
+		default:
+			val = JSON.stringify(val);
 	}
 
 	// No need to escape backslashes with default PostgreSQL 9.1+ config.

package-lock.json

@@ -5,15 +5,20 @@
 	"keywords": [
 		"sql",
 		"query"
-  	],
-	"version": "0.1.26",
+	],
+	"version": "0.1.27",
 	"license": "MIT",
 	"repository": {
 		"url": "http://github.com/dresende/node-sql-query"
 	},
 	"contributors": [
-		{ "name" : "Benjamin Pannell", "email" : "[email protected]" },
-		{ "name" : "Arek W" }
+		{
+			"name": "Benjamin Pannell",
+			"email": "[email protected]"
+		},
+		{
+			"name": "Arek W"
+		}
 	],
 	"scripts": {
 		"test": "make"

package.json

@@ -69,6 +69,16 @@ assert.equal(
   "0"
 );
 
+assert.equal(
+  dialect.escapeVal({ key: 'value' }),
+  "'{\"key\":\"value\"}'"
+);
+
+assert.equal(
+  dialect.escapeVal(Symbol("why does this exist")),
+  "NULL"
+)
+
 assert.equal(
   dialect.escapeVal(new Date(d.getTime() + tzOffsetMillis)),
   "'2013-09-04 19:15:11.133'"

test/integration/test-dialect-mssql.js

@@ -69,6 +69,16 @@ assert.equal(
 	"false"
 );
 
+assert.equal(
+  dialect.escapeVal({ key: 'value' }),
+  "`key` = 'value'"
+);
+
+assert.equal(
+	dialect.escapeVal(Symbol("why does this exist")),
+	"NULL"
+)
+
 assert.equal(
 	dialect.escapeVal(new Date(d.getTime() + tzOffsetMillis)),
 	"'2013-09-04 19:15:11.133'"