Skip to content

Add SqlString.fn Function Call Proxy #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

Add SqlString.fn Function Call Proxy #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
da4fc06
Add support for `toSQL(dialect)` escaping.
kevinmartin Aug 27, 2016
39dedef
Add unit tests for `toSQL()` escaping
kevinmartin Aug 27, 2016
bb30e81
Fix typo in test... :(
kevinmartin Aug 27, 2016
04889b8
Add missing semi-colon on test
kevinmartin Aug 27, 2016
dbf7941
Only allow internal SqlFunction proxy
kevinmartin Dec 1, 2016
46e6206
Remove dialect parameter
kevinmartin Dec 1, 2016
fd10dc4
Whoops, lets take this code to the past...
kevinmartin Dec 1, 2016
2f0f202
And remove string literals...
kevinmartin Dec 1, 2016
dab7ead
Re-do Tests
kevinmartin Dec 1, 2016
d8cd08b
Const -> Var
kevinmartin Dec 1, 2016
da3bdfd
Fix test
kevinmartin Dec 1, 2016
e97634d
Use correct escape quotes
kevinmartin Dec 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions lib/SqlString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ SqlString.escape = function escape(val, stringifyObjects, timeZone) {
return SqlString.arrayToList(val, timeZone);
} else if (Buffer.isBuffer(val)) {
return SqlString.bufferToString(val);
} else if (val instanceof SqlFunction) {
return val.toSQL();
} else if (stringifyObjects) {
val = val.toString();
} else {
Expand Down Expand Up @@ -169,6 +171,30 @@ SqlString.objectToValues = function objectToValues(object, timeZone) {
return sql;
};

if (typeof Proxy === 'function') {
SqlString.fn = new Proxy({}, {
get: function get(target, name) {
if (name in target) {
return target[name];
}

return function sqlFunctionHelper() {
var args = Array.prototype.slice.call(arguments);

return new SqlFunction(name, args);
};
}
});
}

function SqlFunction(name, args) {
var escapedArgs = args.map(SqlString.escape).join(', ');

this.toSQL = function toSQL() {
return name.toUpperCase() + '(' + escapedArgs + ')';
};
}

function escapeString(val) {
var chunkIndex = charsRegex.lastIndex = 0;
var escapedVal = '';
Expand Down
26 changes: 26 additions & 0 deletions test/unit/test-SqlString.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,32 @@ test('SqlString.escape', {
assert.strictEqual(string, "X'00\\' OR \\'1\\'=\\'1'");
},

'SqlString.fn is available if Proxy is supported, otherwise not': function() {
assert.equal(!!SqlString.fn, typeof Proxy === 'function');
},

'SqlString.fn escapes SQL functions properly, if Proxy is supported': function() {
if (typeof Proxy !== 'function') {
return;
}

var a = SqlString.fn.POINT(123, 456);
var b = SqlString.fn.CURRENT_TIMESTAMP();

assert.strictEqual(SqlString.escape(a), 'POINT(123, 456)');
assert.strictEqual(SqlString.escape(b), 'CURRENT_TIMESTAMP()');
},

'SqlString.fn escapes nested SQL functions properly, if Proxy is supported': function() {
if (typeof Proxy !== 'function') {
return;
}

var fn = SqlString.fn.CONCAT(SqlString.fn.UPPER('abc'), SqlString.fn.LOWER('ABC'));

assert.strictEqual(SqlString.escape(fn), "CONCAT(UPPER('abc'), LOWER('ABC'))");
},

'NaN -> NaN': function() {
assert.equal(SqlString.escape(NaN), 'NaN');
},
Expand Down