Allow custom named properties and custom selects

Author: dxg

lib/Dialects/mysql.js

@@ -1,6 +1,10 @@
 var util    = require("util");
 var helpers = require("../Helpers");
 
+exports.escape = function (query, args) {
+	return helpers.escapeQuery(exports, query, args);
+}
+
 exports.escapeId = function () {
 	return Array.prototype.slice.apply(arguments).map(function (el) {
 		if (typeof el == "object") {

lib/Dialects/postgresql.js

@@ -1,6 +1,10 @@
 var util    = require("util");
 var helpers = require("../Helpers");
 
+exports.escape = function (query, args) {
+	return helpers.escapeQuery(exports, query, args);
+}
+
 exports.escapeId = function () {
 	return Array.prototype.slice.apply(arguments).map(function (el) {
 		if (typeof el == "object") {

lib/Dialects/sqlite.js

@@ -1,6 +1,10 @@
 var util    = require("util");
 var helpers = require("../Helpers");
 
+exports.escape = function (query, args) {
+	return helpers.escapeQuery(exports, query, args);
+}
+
 exports.escapeId = require("./mysql").escapeId;
 
 exports.escapeVal = function (val, timeZone) {

lib/Select.js

@@ -247,38 +247,44 @@ function SelectQuery(Dialect, opts) {
 						continue;
 					}
 
-					if (!sql.from[i].select[j].f) continue;
-
 					str = sql.from[i].select[j].f + "(";
 
-					if (sql.from[i].select[j].c && !Array.isArray(sql.from[i].select[j].c)) {
-						sql.from[i].select[j].c = [ sql.from[i].select[j].c ];
-					}
+					if (sql.from[i].select[j].f) {
+						str = sql.from[i].select[j].f + "(";
+
+						if (sql.from[i].select[j].c && !Array.isArray(sql.from[i].select[j].c)) {
+							sql.from[i].select[j].c = [ sql.from[i].select[j].c ];
+						}
 
-					if (Array.isArray(sql.from[i].select[j].c)) {
-						str += sql.from[i].select[j].c.map(function (el) {
-							if (typeof el.type == "function") {
-								switch (el.type()) {
-									case "text":
-										return Dialect.escapeVal(el.data, opts.timezone);
-									default:
-										return el;
+						if (Array.isArray(sql.from[i].select[j].c)) {
+							str += sql.from[i].select[j].c.map(function (el) {
+								if (typeof el.type == "function") {
+									switch (el.type()) {
+										case "text":
+											return Dialect.escapeVal(el.data, opts.timezone);
+										default:
+											return el;
+									}
 								}
-							}
-							if (typeof el != "string") {
-								return el;
-							}
-							if (sql.from.length == 1) {
-								return Dialect.escapeId(el);
-							} else {
-								return Dialect.escapeId(sql.from[i].a, el);
-							}
-						}).join(", ");
+								if (typeof el != "string") {
+									return el;
+								}
+								if (sql.from.length == 1) {
+									return Dialect.escapeId(el);
+								} else {
+									return Dialect.escapeId(sql.from[i].a, el);
+								}
+							}).join(", ");
+						} else {
+							str += "*";
+						}
+						str += ")";
+					} else if (sql.from[i].select[j].sql) {
+						str = '(' + sql.from[i].select[j].sql + ')';
 					} else {
-						str += "*";
+						continue;
 					}
 
-					str += ")";
 					str += (sql.from[i].select[j].a ? " AS " + Dialect.escapeId(sql.from[i].select[j].a) : "");
 
 					if (sql.from[i].select[j].s && sql.from[i].select[j].s.length > 0) {

package.json

@@ -6,7 +6,7 @@
 		"sql",
 		"query"
   	],
-	"version": "0.1.16",
+	"version": "0.1.17",
 	"license": "MIT",
 	"repository": {
 		"url": "http://github.com/dresende/node-sql-query"