orange-orm 4.0.1 → 4.1.0

package/src/sap/mergeSql.js

@@ -1,6 +1,8 @@
+const getSessionSingleton = require('../table/getSessionSingleton');
+
 function insertSql(table, row, options) {
+	const quote = getSessionSingleton('quote');
 	let columnNames = [];
-	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];
 	addDiscriminators();
@@ -9,19 +11,19 @@ function insertSql(table, row, options) {
 	const matched = whenMatched();
 	let sql;
 	if (matched)
-		sql = `MERGE INTO ${table._dbName} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN MATCHED THEN ${matched} WHEN NOT MATCHED THEN ${whenNotMatched()};`;
+		sql = `MERGE INTO ${quote(table._dbName)} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN MATCHED THEN ${matched} WHEN NOT MATCHED THEN ${whenNotMatched()};`;
 	else
-		sql = `MERGE INTO ${table._dbName} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN NOT MATCHED THEN ${whenNotMatched()};`;
+		sql = `MERGE INTO ${quote(table._dbName)} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN NOT MATCHED THEN ${whenNotMatched()};`;
 
 	return sql;
 
 	function join() {
 		const discriminators = table._columnDiscriminators.map(x => {
-			const name = x.split('=')[0];
+			const name = quote(x.split('=')[0]);
 
 			return `target.${name}=source.${name}`;
 		});
-		const primaries = table._primaryColumns.map(x => `target.${x._dbName}=source.${x._dbName}`);
+		const primaries = table._primaryColumns.map(x => `target.${quote(x._dbName)}=source.${quote(x._dbName)}`);
 		return [...discriminators, ...primaries].join(' AND ');
 	}
 
@@ -40,7 +42,7 @@ function insertSql(table, row, options) {
 		let discriminators = table._columnDiscriminators;
 		for (let i = 0; i < discriminators.length; i++) {
 			let parts = discriminators[i].split('=');
-			columnNames.push(parts[0]);
+			columnNames.push(quote(parts[0]));
 			values.push(`${parts[1]} AS ${parts[0]}`);
 		}
 	}
@@ -50,10 +52,10 @@ function insertSql(table, row, options) {
 		let columns = table._columns;
 		for (let i = 0; i < columns.length; i++) {
 			let column = columns[i];
-			regularColumnNames.push(column._dbName);
+			const columnName = quote(column._dbName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
-				values.push(`%s AS ${column.alias}`);
+				columnNames.push(columnName);
+				values.push(`%s AS ${quote(column.alias)}`);
 				addConflictUpdate(column);
 			}
 		}
@@ -62,10 +64,11 @@ function insertSql(table, row, options) {
 
 		function addConflictUpdate(column) {
 			let concurrency = options[column.alias]?.concurrency || options.concurrency;
+			const columnName = quote(column._dbName);
 			if (concurrency === 'overwrite')
-				conflictColumnUpdates.push(`target.${column._dbName}=source.${column._dbName}`);
+				conflictColumnUpdates.push(`target.${columnName}=source.${columnName}`);
 			else if (concurrency === 'optimistic')
-				conflictColumnUpdates.push(`target.${column._dbName} = CASE WHEN target.${column._dbName} <> source.${column._dbName} THEN CAST('12345678-1234-1234-1234-123456789012Conflict when updating ${column._dbName}12345678-1234-1234-1234-123456789012' AS INTEGER) ELSE target.${column._dbName} END`);
+				conflictColumnUpdates.push(`target.${columnName} = CASE WHEN target.${columnName} <> source.${columnName} THEN CAST('12345678-1234-1234-1234-123456789012Conflict when updating ${columnName}12345678-1234-1234-1234-123456789012' AS INTEGER) ELSE target.${columnName} END`);
 		}
 	}
 }

package/src/sap/newTransaction.js

@@ -53,6 +53,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSap();
 				};
 				rdb.aggregateCount = 0;
+				rdb.quote = (name) => `[${name}]`;
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/sap/selectForUpdateSql.js

@@ -1,3 +1,5 @@
+const quote = require('../table/quote');
+
 module.exports = function(alias) {
-	return ' FOR UPDATE OF ' + alias;
+	return ' FOR UPDATE OF ' + quote(alias);
 };

package/src/sqlite/deleteFromSql.js

@@ -1,8 +1,10 @@
 var format = 'delete from %s where %s.rowId in (SELECT %s.rowId FROM %s %s%s)';
 var util = require('util');
+const quote = require('../table/quote');
 
 function deleteFromSql(table, alias, whereSql) {
-	var name = table._dbName;
+	var name = quote(table._dbName);
+	alias = quote(alias);
 	return util.format(format, name, name, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/sqlite/insertSql.js

@@ -1,10 +1,11 @@
+const quote = require('../table/quote');
+
 function insertSql(table, row, options) {
 	let columnNames = [];
-	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];
 
-	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	let sql = 'INSERT INTO ' + quote(table._dbName) + ' ';
 	addDiscriminators();
 	addColumns();
 
@@ -18,7 +19,7 @@ function insertSql(table, row, options) {
 
 	function onConflict() {
 		if (options.concurrency === 'skipOnConflict' || options.concurrency === 'overwrite') {
-			const primaryKeys = table._primaryColumns.map(x => x._dbName).join(',');
+			const primaryKeys = table._primaryColumns.map(x => quote(x._dbName)).join(',');
 			return ` ON CONFLICT(${primaryKeys}) ${conflictColumnUpdateSql}`;
 		} else {
 			return '';
@@ -29,7 +30,7 @@ function insertSql(table, row, options) {
 		let discriminators = table._columnDiscriminators;
 		for (let i = 0; i < discriminators.length; i++) {
 			let parts = discriminators[i].split('=');
-			columnNames.push(parts[0]);
+			columnNames.push(quote(parts[0]));
 			values.push(parts[1]);
 		}
 	}
@@ -39,9 +40,9 @@ function insertSql(table, row, options) {
 		let columns = table._columns;
 		for (let i = 0; i < columns.length; i++) {
 			let column = columns[i];
-			regularColumnNames.push(column._dbName);
+			const columnName = quote(column._dbName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
+				columnNames.push(columnName);
 				values.push('%s');
 				addConflictUpdate(column);
 			}
@@ -53,10 +54,12 @@ function insertSql(table, row, options) {
 
 		function addConflictUpdate(column) {
 			let concurrency = options[column.alias]?.concurrency || options.concurrency;
+			const tableName = table._dbName;
+			const columnName = quote(column._dbName);
 			if (concurrency === 'overwrite') {
-				conflictColumnUpdates.push(`${column._dbName}=excluded.${column._dbName}`);
+				conflictColumnUpdates.push(`${columnName}=excluded.${columnName}`);
 			} else if (concurrency === 'optimistic')
-				conflictColumnUpdates.push(`${column._dbName} = CASE WHEN ${table._dbName}.${column._dbName} <> excluded.${column._dbName} THEN '12345678-1234-1234-1234-123456789012Conflict when updating ${column._dbName}12345678-1234-1234-1234-123456789012' ELSE ${table._dbName}.${column._dbName} END`);
+				conflictColumnUpdates.push(`${columnName} = CASE WHEN ${tableName}.${columnName} <> excluded.${columnName} THEN '12345678-1234-1234-1234-123456789012Conflict when updating ${columnName}12345678-1234-1234-1234-123456789012' ELSE ${tableName}.${columnName} END`);
 		}
 	}
 }

package/src/sqlite/newTransaction.js

@@ -42,6 +42,7 @@ function newResolveTransaction(domain, pool) {
 					caller.visitSqlite();
 				};
 				rdb.aggregateCount = 0;
+				rdb.quote = (name) => `"${name}"`;
 				domain.rdb = rdb;
 				onSuccess();
 			} catch (e) {

package/src/sqlite/selectForUpdateSql.js

@@ -1,3 +1,5 @@
+const quote = require('../table/quote');
+
 module.exports = function(alias) {
-	return ' FOR UPDATE OF ' + alias;
+	return ' FOR UPDATE OF ' + quote(alias);
 };

package/src/table/column/date/formatOut.js

@@ -1,11 +1,14 @@
 var getSessionSingleton = require('../../getSessionSingleton');
+const quote = require('../../quote');
+
+//todo fix
 
 function formatOut(column, alias) {
 	var formatColumn = getSessionSingleton('formatDateOut');
 	if (formatColumn)
 		return formatColumn(column, alias);
 	else
-		return `${alias}.${column._dbName}`;
+		return `${alias}.${quote(column._dbName)}`;
 }
 
 module.exports = formatOut;

package/src/table/column/equal.js

@@ -1,13 +1,14 @@
 var newBoolean = require('./newBoolean');
 var nullOperator = ' is ';
 var encodeFilterArg = require('./encodeFilterArg');
+var quote = require('../quote');
 
 function equal(column,arg,alias) {
 	var operator = '=';
 	var encoded = encodeFilterArg(column, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/extractAlias.js

@@ -1,6 +1,8 @@
 function extract(table, optionalAlias) {
+
 	if (optionalAlias)
 		return optionalAlias;
+	// return table._rootAlias || quote(table._dbName);
 	return table._rootAlias || table._dbName;
 }
 

package/src/table/column/greaterThan.js

@@ -1,10 +1,11 @@
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
+var quote = require('../quote');
 
 function greaterThan(column,arg,alias) {
 	var operator = '>';
 	var encoded = encodeFilterArg(column, arg);
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/greaterThanOrEqual.js

@@ -1,10 +1,11 @@
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
+var quote = require('../quote');
 
 function greaterThanOrEqual(column,arg,alias) {
 	var operator = '>=';
 	var encoded = encodeFilterArg(column, arg);
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/in.js

@@ -1,6 +1,7 @@
 var newParameterized = require('../query/newParameterized');
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
+var quote = require('../quote');
 
 function _in(column,values,alias) {
 	var filter;
@@ -8,7 +9,7 @@ function _in(column,values,alias) {
 		filter =  newParameterized('1=2');
 		return newBoolean(filter);
 	}
-	var firstPart = alias + '.' + column._dbName + ' in ';
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + ' in ';
 	var parameterized = newParameterized(firstPart);
 	var separator = '(';
 

package/src/table/column/json/formatOut.js

@@ -1,11 +1,12 @@
 var getSessionSingleton = require('../../getSessionSingleton');
+const quote = require('../../quote');
 
 function formatOut(column, alias) {
 	var formatColumn = getSessionSingleton('formatJSONOut');
 	if (formatColumn)
 		return formatColumn(column, alias);
 	else
-		return `${alias}.${column._dbName}`;
+		return `${alias}.${quote(column._dbName)}`;
 }
 
 module.exports = formatOut;

package/src/table/column/lessThan.js

@@ -1,10 +1,11 @@
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
+var quote = require('../quote');
 
 function lessThanOrEqual(column,arg,alias) {
 	var operator = '<';
 	var encoded = encodeFilterArg(column, arg);
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter = encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/lessThanOrEqual.js

@@ -1,10 +1,12 @@
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
+const getSessionSingleton = require('../getSessionSingleton');
 
 function lessThanOrEqual(column,arg,alias) {
+	const quote = getSessionSingleton('quote');
 	var operator = '<=';
 	var encoded = encodeFilterArg(column, arg);
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter = encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/newColumn.js

@@ -6,6 +6,7 @@ const greaterThan = require('./greaterThan');
 const greaterThanOrEqual = require('./greaterThanOrEqual');
 const _in = require('./in');
 const _extractAlias = require('./extractAlias');
+const quote = require('../../table/quote');
 
 module.exports = function(table, name) {
 	var c = {};
@@ -76,12 +77,14 @@ module.exports = function(table, name) {
 	c.self = self;
 
 	function self() {
-		const tableAlias = table._rootAlias || table._dbName;
+		const tableAlias = quote(table._rootAlias || table._dbName);
+		const columnName = quote(c._dbName);
+
 		return {
-			expression: (alias) => `${tableAlias}.${c._dbName} ${alias}`,
+			expression: (alias) => `${tableAlias}.${columnName} ${quote(alias)}`,
 			joins: [''],
 			column: c,
-			groupBy: `${tableAlias}.${c._dbName}`
+			groupBy: `${tableAlias}.${columnName}`
 		};
 	}
 

package/src/table/column/notEqual.js

@@ -1,13 +1,14 @@
 var newBoolean = require('./newBoolean');
 var encodeFilterArg = require('./encodeFilterArg');
 var nullOperator = ' is not ';
+var quote = require('../quote');
 
 function notEqual(column,arg,alias) {
 	var operator = '<>';
 	var encoded = encodeFilterArg(column, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/containsCore.js

@@ -1,14 +1,16 @@
+const quote = require('../../quote');
 var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 
 function endsWithCore(operator, column,arg,alias) {
+	alias = quote(alias);
 	operator = ' ' + operator + ' ';
 	var encoded = column.encode(arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
 	else
 		encoded = column.encode('%' + arg + '%');
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = alias + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/endsWithCore.js

@@ -1,14 +1,16 @@
+const quote = require('../../quote');
 var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 
 function endsWithCore(operator, column,arg,alias) {
+	alias = quote(alias);
 	operator = ' ' + operator + ' ';
 	var encoded = column.encode(arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
 	else
 		encoded = column.encode('%' + arg);
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = alias + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/iEqual.js

@@ -1,13 +1,14 @@
 var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 var encodeFilterArg = require('../encodeFilterArg');
+const quote = require('../../quote');
 
 function iEqual(column,arg,alias) {
 	var operator = ' ILIKE ';
 	var encoded = encodeFilterArg(column, arg);
 	if (encoded.sql() == 'null')
 		operator = nullOperator;
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = alias + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/column/string/startsWithCore.js

@@ -1,5 +1,6 @@
 var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
+var quote = require('../../quote');
 
 function startsWithCore(operator, column,arg,alias) {
 	operator = ' ' + operator + ' ';
@@ -8,7 +9,7 @@ function startsWithCore(operator, column,arg,alias) {
 		operator = nullOperator;
 	else
 		encoded = column.encode(arg + '%');
-	var firstPart = alias + '.' + column._dbName + operator;
+	var firstPart = quote(alias) + '.' + quote(column._dbName) + operator;
 	var filter =  encoded.prepend(firstPart);
 	return newBoolean(filter);
 }

package/src/table/commands/delete/singleCommand/selectSql.js

@@ -1,9 +1,11 @@
 var newParameterized = require('../../../query/newParameterized');
 var newBoolean = require('../../../column/newBoolean');
+const quote = require('../../../quote');
 
 function newSelectSql(table, alias) {
-	var colName = table._primaryColumns[0]._dbName;
-	var sql = 'SELECT ' + alias + '.' + colName + ' FROM ' + table._dbName + ' ' + alias;
+	var colName = quote(table._primaryColumns[0]._dbName);
+	alias = quote(alias);
+	var sql = 'SELECT ' + alias + '.' + colName + ' FROM ' + quote(table._dbName) + ' ' + alias;
 	sql = newParameterized(sql);
 	return newBoolean(sql);
 }

package/src/table/commands/insert/getSqlTemplate.js

@@ -1,4 +1,5 @@
 let getSessionContext = require('../../getSessionContext');
+let quote = require('../../quote');
 
 function getSqlTemplate(_table, _row) {
 	let context = getSessionContext();
@@ -11,9 +12,8 @@ function getSqlTemplate(_table, _row) {
 
 function getSqlTemplateDefault(table, row) {
 	let columnNames = [];
-	let regularColumnNames = [];
 	let values = [];
-	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	let sql = 'INSERT INTO ' + quote(table._dbName) + ' ';
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0)
@@ -26,7 +26,7 @@ function getSqlTemplateDefault(table, row) {
 		let discriminators = table._columnDiscriminators;
 		for (let i = 0; i < discriminators.length; i++) {
 			let parts = discriminators[i].split('=');
-			columnNames.push(parts[0]);
+			columnNames.push(quote(parts[0]));
 			values.push(parts[1]);
 		}
 	}
@@ -35,9 +35,8 @@ function getSqlTemplateDefault(table, row) {
 		let columns = table._columns;
 		for (let i = 0; i < columns.length; i++) {
 			let column = columns[i];
-			regularColumnNames.push(column._dbName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
+				columnNames.push(quote(column._dbName));
 				values.push('%s');
 			}
 		}

package/src/table/commands/newGetLastInsertedCommandCore.js

@@ -1,14 +1,16 @@
-let newParameterized = require('../query/newParameterized');
-let getSessionContext = require('../getSessionContext');
+const newParameterized = require('../query/newParameterized');
+const getSessionContext = require('../getSessionContext');
+const newDiscriminatorSql = require('../query/singleQuery/newDiscriminatorSql');
+const quote = require('../quote');
 
 function newGetLastInsertedCommandCore(table, row) {
 	let parameters = [];
 	let keyValues = table._primaryColumns.map(column => row['__' + column.alias]);
-	let sql = `SELECT ${columnNames()} FROM ${table._dbName} WHERE ${whereSql()}`;
+	let sql = `SELECT ${columnNames()} FROM ${quote(table._dbName)} WHERE ${whereSql()}`;
 	return newParameterized(sql, parameters);
 
 	function columnNames() {
-		return table._columns.map(col => col._dbName).join(',');
+		return table._columns.map(col => quote(col._dbName)).join(',');
 	}
 
 	function whereSql() {
@@ -35,7 +37,7 @@ function newGetLastInsertedCommandCore(table, row) {
 	}
 
 	function discriminators() {
-		return table._columnDiscriminators.join(',');
+		return newDiscriminatorSql(table, table._dbName);
 	}
 }
 

package/src/table/commands/newUpdateCommandCore.js

@@ -1,7 +1,9 @@
+const getSessionSingleton = require('../getSessionSingleton');
 var newParameterized = require('../query/newParameterized');
 
 function newUpdateCommandCore(table, columns, row) {
-	var command = newParameterized('UPDATE ' + table._dbName + ' SET');
+	const quote = getSessionSingleton('quote');
+	var command = newParameterized('UPDATE ' + quote(table._dbName) + ' SET');
 	var separator = ' ';
 
 	addColumns();
@@ -12,7 +14,7 @@ function newUpdateCommandCore(table, columns, row) {
 		for (var alias in columns) {
 			var column = columns[alias];
 			var encoded = column.encode(row[alias]);
-			command = command.append(separator + column._dbName + '=').append(encoded);
+			command = command.append(separator + quote(column._dbName) + '=').append(encoded);
 			separator = ',';
 		}
 	}
@@ -24,7 +26,7 @@ function newUpdateCommandCore(table, columns, row) {
 			var column = columns[i];
 			var value = row[column.alias];
 			var encoded = column.encode(value);
-			command = command.append(separator + column._dbName + '=').append(encoded);
+			command = command.append(separator + quote(column._dbName) + '=').append(encoded);
 			separator = ' AND ';
 		}
 	}

package/src/table/count.js

@@ -2,6 +2,7 @@ const executeQueries = require('./executeQueries');
 const negotiateRawSqlFilter = require('./column/negotiateRawSqlFilter');
 const extractFilter = require('./query/extractFilter');
 const newWhereSql = require('./query/singleQuery/newWhereSql');
+const quote = require('./quote');
 
 async function count(table, filter) {
 	let alias = table._dbName;
@@ -18,7 +19,8 @@ async function count(table, filter) {
 
 function newQuery(table, filter, alias) {
 	filter = extractFilter(filter);
-	var name = table._dbName;
+	var name = quote(table._dbName);
+	alias = quote(alias);
 	var whereSql = newWhereSql(table, filter, alias);
 
 	return whereSql.prepend('select count(*) "_count" from ' + name + ' ' + alias);

package/src/table/newRelatedTable.js

@@ -27,7 +27,6 @@ function newRelatedTable(relations, isShallow, depth = 0) {
 	// @ts-ignore
 	c.where =  where(relations, depth);
 
-	//todo
 	// @ts-ignore
 	c._aggregate = aggregate(relations);
 

package/src/table/query/extractOrderBy.js

@@ -1,4 +1,8 @@
+const getSessionSingleton = require('../getSessionSingleton');
+
 function extractOrderBy(table, alias, orderBy, originalOrderBy) {
+	const quote = getSessionSingleton('quote');
+	alias = quote(alias);
 	var dbNames = [];
 	var i;
 	if (orderBy) {
@@ -33,7 +37,7 @@ function extractOrderBy(table, alias, orderBy, originalOrderBy) {
 		var column = getTableColumn(property);
 		var jsonQuery = getJsonQuery(property, column.alias);
 
-		dbNames.push(alias + '.' + column._dbName + jsonQuery + direction);
+		dbNames.push(alias + '.' + quote(column._dbName) + jsonQuery + direction);
 	}
 
 	function getTableColumn(property) {

package/src/table/query/newSingleQuery.js

@@ -4,16 +4,17 @@ var newWhereSql = require('./singleQuery/newWhereSql');
 var negotiateLimit = require('./singleQuery/negotiateLimit');
 var negotiateExclusive = require('./singleQuery/negotiateExclusive');
 var newParameterized = require('../../table/query/newParameterized');
+var quote = require('../quote');
 
 function _new(table,filter,span,alias,innerJoin,orderBy,limit,offset,exclusive) {
 
-	var name = table._dbName;
+	var name = quote(table._dbName);
 	var columnSql = newColumnSql(table,span,alias);
 	var joinSql = newJoinSql(span,alias);
 	var whereSql = newWhereSql(table,filter,alias);
 	var safeLimit = negotiateLimit(limit);
 	var exclusiveClause = negotiateExclusive(table,alias,exclusive);
-	return newParameterized('select' + safeLimit + ' ' + columnSql + ' from ' + name + ' ' + alias)
+	return newParameterized('select' + safeLimit + ' ' + columnSql + ' from ' + name + ' ' + quote(alias))
 		.append(innerJoin)
 		.append(joinSql)
 		.append(whereSql)

package/src/table/query/singleQuery/columnSql/newShallowColumnSql.js

@@ -1,4 +1,8 @@
+const getSessionSingleton = require('../../../getSessionSingleton');
+
 function _new(table, alias, span, ignoreNulls) {
+	const quote = getSessionSingleton('quote');
+	const quotedAlias = quote(alias);
 	let columnsMap = span.columns;
 	var columns = table._columns;
 	var sql = '';
@@ -7,11 +11,11 @@ function _new(table, alias, span, ignoreNulls) {
 	for (let i = 0; i < columns.length; i++) {
 		var column = columns[i];
 		if (!columnsMap || (columnsMap.get(column))) {
-			sql = sql + separator + formatColumn(column) + ' as s' + alias + i;
+			sql = sql + separator + formatColumn(column) + ' as ' + quote('s' + alias + i);
 			separator = ',';
 		}
 		else if (!ignoreNulls) {
-			sql = sql + separator + 'null as s' + alias + i;
+			sql = sql + separator + 'null as ' + quote('s' + alias + i);
 			separator = ',';
 		}
 	}
@@ -24,7 +28,7 @@ function _new(table, alias, span, ignoreNulls) {
 	return sql;
 
 	function formatColumn(column) {
-		const formatted = column.formatOut ? column.formatOut(alias) : alias + '.' + column._dbName;
+		const formatted = column.formatOut ? column.formatOut(quotedAlias) : quotedAlias + '.' + quote(column._dbName);
 		if (column.dbNull === null)
 			return formatted;
 		else {

package/src/table/query/singleQuery/joinSql/newShallowJoinSql.js

@@ -1,7 +1,9 @@
 var newJoinCore = require('./newShallowJoinSqlCore');
+const getSessionSingleton = require('../../../getSessionSingleton');
 
 function _new(rightTable,leftColumns,rightColumns,leftAlias,rightAlias, filter) {
-	var sql = ' JOIN ' + rightTable._dbName + ' ' +  rightAlias + ' ON (';
+	const quote = getSessionSingleton('quote');
+	var sql = ' JOIN ' + quote(rightTable._dbName) + ' ' +  quote(rightAlias) + ' ON (';
 	var joinCore = newJoinCore(rightTable,leftColumns,rightColumns,leftAlias,rightAlias,filter);
 	return joinCore.prepend(sql).append(')');
 }