pg-query-formatter
Advanced tools
Comparing version 0.0.4 to 0.0.5
{ | ||
"name": "pg-query-formatter", | ||
"version": "0.0.4", | ||
"version": "0.0.5", | ||
"description": "Lightweight query string formatter for node", | ||
@@ -5,0 +5,0 @@ "url": "http://github.com/naturalatlas/pg-query-formatter", |
23
query.js
var pgescape = require('pg-escape'); | ||
var escapeIdent = function(ident){ | ||
var i = ident.indexOf('.'); | ||
if (i > -1) { | ||
return pgescape.ident(ident.substring(0, i)) + "." + pgescape.ident(ident.substring(i+1)); | ||
} else { | ||
return pgescape.ident(ident); | ||
} | ||
} | ||
var escapeLiteral = pgescape.literal; | ||
var escapeString = pgescape.string; | ||
/** | ||
@@ -97,5 +108,5 @@ * Creates a query object from a format string and a list of values | ||
case 's': | ||
return value.map(pgescape.string).join(', '); | ||
return value.map(escapeString).join(', '); | ||
case 'I': | ||
return value.map(pgescape.ident).join(', '); | ||
return value.map(escapeIdent).join(', '); | ||
case 'L': | ||
@@ -127,5 +138,5 @@ return value.map(function(value){ | ||
case 's': | ||
return pgescape.string(value); | ||
return escapeString(value); | ||
case 'I': | ||
return pgescape.ident(value); | ||
return escapeIdent(value); | ||
case 'L': | ||
@@ -138,3 +149,3 @@ if(value === null || value === undefined){ | ||
case 'Q': | ||
if(typeof value === 'string') return pgescape.string(value); | ||
if(typeof value === 'string') return escapeString(value); | ||
var subquery = value.toParam(use_numbered_params, numbering_index); | ||
@@ -161,3 +172,3 @@ values = values.concat(subquery.values); | ||
if(typeof value === 'string'){ | ||
str = pgescape.literal(str); | ||
str = escapeLiteral(str); | ||
} | ||
@@ -164,0 +175,0 @@ return str; |
23091
229