orange-orm 4.0.0 → 4.1.0

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(')');
 }

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

@@ -1,7 +1,10 @@
 var newDiscriminatorSql = require('./newDiscriminatorSql');
 var newParameterized = require('../../newParameterized');
+var quote = require('../../../quote');
 
 function _new(rightTable,leftColumns,rightColumns,leftAlias,rightAlias,filter) {
+	leftAlias = quote(leftAlias);
+	rightAlias = quote(rightAlias);
 	var sql = '';
 	var delimiter = '';
 	for (var i = 0; i < leftColumns.length; i++) {
@@ -12,7 +15,7 @@ function _new(rightTable,leftColumns,rightColumns,leftAlias,rightAlias,filter) {
 	function addColumn(index) {
 		var leftColumn = leftColumns[index];
 		var rightColumn = rightColumns[index];
-		sql += delimiter + leftAlias + '.' + leftColumn._dbName + '=' + rightAlias + '.' + rightColumn._dbName;
+		sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
 	}
 
 	sql += newDiscriminatorSql(rightTable,rightAlias);

package/src/table/query/singleQuery/newDiscriminatorSql.js

@@ -1,4 +1,8 @@
+const getSessionSingleton = require('../../getSessionSingleton');
+
 function newDiscriminatorSql(table, alias) {
+	const quote = getSessionSingleton('quote');
+	alias = quote(alias);
 	var result = '';
 	var formulaDiscriminators = table._formulaDiscriminators;
 	var columnDiscriminators = table._columnDiscriminators;
@@ -16,9 +20,9 @@ function newDiscriminatorSql(table, alias) {
 
 	function addColumn() {
 		for (var i = 0; i< columnDiscriminators.length; i++) {
-			var current = columnDiscriminators[i];
+			var current = columnDiscriminators[i].split('=');
 			and();
-			result += alias + '.' + current;
+			result += alias + '.' + quote(current[0]) + '=' + current[1];
 		}
 	}
 

package/src/table/quote.js

@@ -0,0 +1,11 @@
+let tryGetSessionContext = require('./tryGetSessionContext');
+
+function quote(name) {
+	let context = tryGetSessionContext();
+	if (!context)
+		throw new Error('Rdb transaction is no longer available. Is promise chain broken ?');
+	let fn = context.quote || (() => `"${name}"`);
+	return fn(name);
+}
+
+module.exports = quote;

package/src/table/readStream/extractOrderBy.js

@@ -1,4 +1,8 @@
+const getSessionSingleton = require('../getSessionSingleton');
+
 function extractOrderBy(alias, span) {
+	const quote = getSessionSingleton('quote');
+	alias = quote(alias);
 	var table = span.table;
 	var dbNames = [];
 	var orderBy = span.orderBy;
@@ -32,7 +36,7 @@ function extractOrderBy(alias, span) {
 		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) {
 		var column = table[property] || table[property.split(/(-|#)>+/g)[0]];

package/src/table/readStream/mySql/query/newSubQueries/joinLegToQuery.js

@@ -1,4 +1,5 @@
 var newShallowJoinSql = require('../../../../query/singleQuery/joinSql/newShallowJoinSqlCore');
+const quote = require('../../../../quote');
 var newQuery = require('./newQueryCore');
 var util = require('util');
 
@@ -13,7 +14,7 @@ function joinLegToQuery(parentAlias,leg,legNo) {
 	var shallowJoin  = newShallowJoinSql(parentTable,childColumns,parentColumns,childAlias,parentAlias);
 	var query = newQuery(childTable,span,childAlias);
 
-	return util.format(',\'%s\',(select %s from %s %s where %s)', leg.name, query.sql(), childTable._dbName, childAlias, shallowJoin);
+	return util.format(',\'%s\',(select %s from %s %s where %s)', leg.name, query.sql(), quote(childTable._dbName), quote(childAlias), shallowJoin);
 }
 
 module.exports = joinLegToQuery;

package/src/table/readStream/mySql/query/singleQuery/newShallowColumnSql.js

@@ -1,4 +1,5 @@
 var util = require('util');
+const quote = require('../../../../quote');
 
 function _new(table,alias) {
 	var columnFormat = '\'%s\',%s.%s';
@@ -8,7 +9,7 @@ function _new(table,alias) {
 	for (var i = 0; i < columns.length; i++) {
 		var column = columns[i];
 		if (!('serializable' in column && !column.serializable))
-			sql = sql + separator + util.format(columnFormat, column.alias, alias, column._dbName);
+			sql = sql + separator + util.format(columnFormat, quote(column.alias), alias, quote(column._dbName));
 		separator = ',';
 	}
 	return sql;

package/src/table/readStream/pg/query/singleQuery/newShallowColumnSql.js

@@ -1,4 +1,5 @@
 var util = require('util');
+const quote = require('../../../../quote');
 
 function _new(table,alias,span) {
 	let columnsMap = span.columns;
@@ -9,7 +10,7 @@ function _new(table,alias,span) {
 	for (var i = 0; i < columns.length; i++) {
 		var column = columns[i];
 		if (!('serializable' in column && !column.serializable) && (!columnsMap || (columnsMap.get(column)))) {
-			sql = sql + separator + util.format(columnFormat, column._dbName, column.alias);
+			sql = sql + separator + util.format(columnFormat, quote(column._dbName), quote(column.alias));
 			separator = ',' + alias + '.';
 		}
 	}

package/src/table/relatedTable/childColumn.js

@@ -1,23 +1,28 @@
 var newJoin = require('./joinSql');
 var getSessionContext = require('../getSessionContext');
 var newJoinCore = require('../query/singleQuery/joinSql/newShallowJoinSqlCore');
+const getSessionSingleton = require('../getSessionSingleton');
+const _quote = require('../quote');
+
 
 function childColumn(column, relations) {
+	const quote = getSessionSingleton('quote');
 	const context = getSessionContext();
 	const outerAlias = 'y' + context.aggregateCount++;
+	const outerAliasQuoted = quote(outerAlias);
 	const alias = 'x' + relations.length;
 	const foreignKeys = getForeignKeys(relations[0]);
-	const select = ` LEFT JOIN (SELECT ${foreignKeys},${alias}.${column._dbName} as prop`;
+	const select = ` LEFT JOIN (SELECT ${foreignKeys},${alias}.${quote(column._dbName)} as prop`;
 	const innerJoin = relations.length > 1 ? newJoin(relations).sql() : '';
 	const onClause = createOnClause(relations[0], outerAlias);
-	const from = ` FROM ${relations.at(-1).childTable._dbName} ${alias} ${innerJoin}) ${outerAlias} ON (${onClause})`;
+	const from = ` FROM ${quote(relations.at(-1).childTable._dbName)} ${alias} ${innerJoin}) ${outerAliasQuoted} ON (${onClause})`;
 	const join = select  + from ;
 
 	return {
-		expression: (alias) => `${outerAlias}.prop ${alias}`,
+		expression: (alias) => `${outerAliasQuoted}.prop ${quote(alias)}`,
 		joins: [join],
 		column,
-		groupBy:  `${outerAlias}.prop`,
+		groupBy:  `${outerAliasQuoted}.prop`,
 	};
 }
 
@@ -55,7 +60,7 @@ function getForeignKeys(relation) {
 		columns = relation.joinRelation.columns;
 	else
 		columns = relation.childTable._primaryColumns;
-	return columns.map(x => `${alias}.${x._dbName}`).join(',');
+	return columns.map(x => `${alias}.${_quote(x._dbName)}`).join(',');
 }
 
 module.exports = childColumn;

package/src/table/relatedTable/columnAggregate.js

@@ -1,13 +1,17 @@
+const getSessionSingleton = require('../getSessionSingleton');
 var newJoinArray = require('./joinSqlArray');
 
 function columnAggregate(operator, column, relations, coalesce = true) {
+	const quote = getSessionSingleton('quote');
 
-	const tableAlias = relations.reduce((prev,relation) => {
+	let tableAlias = relations.reduce((prev,relation) => {
 		return prev + relation.toLeg().name;
 	}, 'z');
+	tableAlias = quote(tableAlias);
+	const columnName = quote(column._dbName);
 
 	return {
-		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${column._dbName}), 0) as ${alias}` : `${operator}(${tableAlias}.${column._dbName}) as ${alias}`,
+		expression: (alias) => coalesce ? `COALESCE(${operator}(${tableAlias}.${columnName}), 0) as ${quote(alias)}` : `${operator}(${tableAlias}.${columnName}) as ${alias}`,
 
 		joins: newJoinArray(relations)
 	};

package/src/table/relatedTable/columnAggregateGroup.js

@@ -1,22 +1,35 @@
 var newJoin = require('./joinSql');
 var getSessionContext = require('../getSessionContext');
 var newJoinCore = require('../query/singleQuery/joinSql/newShallowJoinSqlCore');
+const getSessionSingleton = require('../getSessionSingleton');
 
 function columnAggregate(operator, column, relations, coalesce = true) {
+	const quote = getSessionSingleton('quote');
 	const context = getSessionContext();
 	const outerAlias = 'y' + context.aggregateCount++;
-	const alias = 'x' + relations.length;
+	const outerAliasQuoted = quote(outerAlias);
+	const alias = quote('x' + relations.length);
 	const foreignKeys = getForeignKeys(relations[0]);
-	const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${column._dbName}) as amount`;
+	const select = ` LEFT JOIN (SELECT ${foreignKeys},${operator}(${alias}.${quote(column._dbName)}) as amount`;
 	const innerJoin = relations.length > 1 ? newJoin(relations).sql() : '';
 	const onClause = createOnClause(relations[0], outerAlias);
-	const from = ` FROM ${relations.at(-1).childTable._dbName} ${alias} ${innerJoin} GROUP BY ${foreignKeys}) ${outerAlias} ON (${onClause})`;
+	const from = ` FROM ${quote(relations.at(-1).childTable._dbName)} ${alias} ${innerJoin} GROUP BY ${foreignKeys}) ${outerAliasQuoted} ON (${onClause})`;
 	const join = select  + from ;
 
 	return {
-		expression: (alias) => coalesce? `COALESCE(${outerAlias}.amount, 0) as ${alias}` : `${outerAlias}.amount as ${alias}`,
+		expression: (alias) => coalesce? `COALESCE(${outerAliasQuoted}.amount, 0) as ${quote(alias)}` : `${outerAliasQuoted}.amount as ${alias}`,
 		joins: [join]
 	};
+
+	function getForeignKeys(relation) {
+		let columns;
+		let alias = quote('x1');
+		if (relation.joinRelation)
+			columns = relation.joinRelation.columns;
+		else
+			columns = relation.childTable._primaryColumns;
+		return columns.map(x => `${alias}.${quote(x._dbName)}`).join(',');
+	}
 }
 
 function createOnClause(relation, rightAlias) {
@@ -42,18 +55,11 @@ function createOnClause(relation, rightAlias) {
 
 		sql = newJoinCore(childTable,parentTable._primaryColumns,columns,leftAlias, rightAlias).sql();
 	}
+
 	relation.accept(c);
 	return sql;
 }
 
-function getForeignKeys(relation) {
-	let columns;
-	let alias = 'x1';
-	if (relation.joinRelation)
-		columns = relation.joinRelation.columns;
-	else
-		columns = relation.childTable._primaryColumns;
-	return columns.map(x => `${alias}.${x._dbName}`).join(',');
-}
+
 
 module.exports = columnAggregate;

package/src/table/relatedTable/selectSql.js

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

package/src/table/relatedTable/whereSql.js

@@ -7,6 +7,8 @@ function newWhereSql(relations, shallowFilter, depth = 0) {
 
 	c.visitJoin = function(relation) {
 		var table = relation.childTable;
+
+		//todo fix discriminators
 		var alias = depth === 0 ? (relation.parentTable._rootAlias || relation.parentTable._dbName) : 'x' + depth;
 		var leftColumns = relation.columns;
 		var rightColumns = table._primaryColumns;
@@ -18,6 +20,7 @@ function newWhereSql(relations, shallowFilter, depth = 0) {
 		var rightColumns = joinRelation.columns;
 		var childTable = joinRelation.childTable;
 		var leftColumns = childTable._primaryColumns;
+		//todo fix discriminators
 		var alias = depth === 0 ? (childTable._rootAlias || childTable._dbName) : 'x' + depth;
 		where(alias, leftColumns, rightColumns);
 	};

package/src/tedious/deleteFromSql.js

@@ -1,8 +1,10 @@
 var format = 'delete %s from %s as %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, alias, name, alias, whereSql);
 }
 module.exports = deleteFromSql;

package/src/tedious/formatDateOut.js

@@ -1,5 +1,7 @@
+const quote = require('../table/quote');
+
 function formatDateOut(column, alias) {
-	return `CONVERT(VARCHAR, ${alias}.${column._dbName}, 121)`;
+	return `CONVERT(VARCHAR, ${alias}.${quote(column._dbName)}, 121)`;
 }
 
 module.exports = formatDateOut;

package/src/tedious/formatJSONOut.js

@@ -1,5 +1,5 @@
 function formatJSONOut(column, alias) {
-	return `JSON_QUERY(${alias}.${column._dbName})`;
+	return `JSON_QUERY(${alias}.[${column._dbName}])`;
 }
 
 module.exports = formatJSONOut;

package/src/tedious/getManyDto/query/newSingleQuery.js

@@ -3,8 +3,6 @@ var newWhereSql = require('../../../table/query/singleQuery/newWhereSql');
 var newParameterized = require('../../../table/query/newParameterized');
 
 function _new(table, filter, span, alias, subQueries, orderBy, limit, offset) {
-
-	var name = table._dbName;
 	var columnSql = newColumnSql(table, alias, span);
 	var whereSql = newWhereSql(table, filter, alias);
 	if (limit)
@@ -23,7 +21,7 @@ function _new(table, filter, span, alias, subQueries, orderBy, limit, offset) {
 	}
 
 
-	return newParameterized('select ' + limit + columnSql).append(subQueries).append(' from ' + name + ' ' + alias + join).append(whereSql).append(orderBy + offset);
+	return newParameterized('select ' + limit + columnSql).append(subQueries).append(' from ' + `[${table._dbName}] [${alias}]` + join).append(whereSql).append(orderBy + offset);
 }
 
 module.exports = _new;

package/src/tedious/getManyDto/query/singleQuery/newShallowColumnSql.js

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

package/src/tedious/insertSql.js

@@ -27,9 +27,8 @@ function hasConcurrency(table,options) {
 
 function insertSql(table, row) {
 	let columnNames = [];
-	let regularColumnNames = [];
 	let values = [];
-	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	let sql = `INSERT INTO [${table._dbName}] `;
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0)
@@ -42,7 +41,7 @@ function insertSql(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(`[${parts[0]}]`);
 			values.push(parts[1]);
 		}
 	}
@@ -51,9 +50,8 @@ function insertSql(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(`[${column._dbName}]`);
 				values.push('%s');
 			}
 		}

package/src/tedious/mergeSql.js

@@ -1,8 +1,8 @@
 const outputInsertedSql = require('./outputInsertedSql');
 
 function insertSql(table, row, options) {
+
 	let columnNames = [];
-	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];
 	addDiscriminators();
@@ -11,18 +11,18 @@ 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()} ${outputInsertedSql(table)};`;
+		sql = `MERGE INTO [${table._dbName}] AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN MATCHED THEN ${matched} WHEN NOT MATCHED THEN ${whenNotMatched()} ${outputInsertedSql(table)};`;
 	else
-		sql = `MERGE INTO ${table._dbName} AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN NOT MATCHED THEN ${whenNotMatched()} ${outputInsertedSql(table)};`;
+		sql = `MERGE INTO [${table._dbName}] AS target USING (SELECT ${values.join(',')}) AS source ON ${join()} WHEN NOT MATCHED THEN ${whenNotMatched()} ${outputInsertedSql(table)};`;
 	return sql;
 
 	function join() {
 		const discriminators = table._columnDiscriminators.map(x => {
-			const name = x.split('=')[0];
+			const name = `[${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.[${x._dbName}]=source.[${x._dbName}]`);
 		return [...discriminators, ...primaries].join(' AND ');
 	}
 
@@ -41,8 +41,8 @@ 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]);
-			values.push(`${parts[1]} AS ${parts[0]}`);
+			columnNames.push(`[${parts[0]}]`);
+			values.push(`${parts[1]} AS ${[parts[0]]}`);
 		}
 	}
 
@@ -51,10 +51,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);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
-				values.push(`%s AS ${column.alias}`);
+				columnNames.push(`[${column._dbName}]`);
+				values.push(`%s AS [${column.alias}]`);
 				addConflictUpdate(column);
 			}
 		}
@@ -66,9 +65,9 @@ function insertSql(table, row, options) {
 		function addConflictUpdate(column) {
 			let concurrency = options[column.alias]?.concurrency || options.concurrency;
 			if (concurrency === 'overwrite')
-				conflictColumnUpdates.push(`target.${column._dbName}=source.${column._dbName}`);
+				conflictColumnUpdates.push(`target.[${column._dbName}]=source.[${column._dbName}]`);
 			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.[${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`);
 		}
 	}
 }

package/src/tedious/newTransaction.js

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

package/src/tedious/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/getManyDto/query/newColumnSql.js

@@ -1,8 +0,0 @@
-var newShallowColumnSql = require('./singleQuery/newShallowColumnSql');
-var newJoinedColumnSql = require('./singleQuery/newJoinedColumnSql');
-
-module.exports = function(table,span,alias) {
-	var shallowColumnSql = newShallowColumnSql(table,alias, span);
-	var joinedColumnSql = newJoinedColumnSql(span,alias);
-	return shallowColumnSql + joinedColumnSql;
-};

package/src/getManyDto/query/singleQuery/newJoinedColumnSql.js

@@ -1,25 +0,0 @@
-var util = require('util');
-//todo delete
-function _new(table,alias,span) {
-	let columnsMap = span.columns;
-	var columnFormat = '%s as "%s"';
-	var columns = table._columns;
-	var sql = '';
-	var separator = '';
-	for (var i = 0; i < columns.length; i++) {
-		var column = columns[i];
-		if (!columnsMap || (columnsMap.get(column))) {
-			if (column.dbNull === null)
-				sql = sql + separator + alias + '.' + util.format(columnFormat, column._dbName, column.alias);
-			else {
-				const encoded = column.encode.unsafe(column.dbNull);
-				sql = sql + separator + `CASE WHEN ${alias}.${column._dbName}=${encoded} THEN null ELSE ${alias}.${column._dbName} END as ${column.alias}`;
-			}
-			separator = ',';
-		}
-	}
-
-	return sql;
-}
-
-module.exports = _new;

package/src/getManyDto/query/singleQuery/newShallowColumnSql.js

@@ -1,25 +0,0 @@
-var util = require('util');
-//todo delete
-function _new(table,alias,span) {
-	let columnsMap = span.columns;
-	var columnFormat = '%s as "%s"';
-	var columns = table._columns;
-	var sql = '';
-	var separator = '';
-	for (var i = 0; i < columns.length; i++) {
-		var column = columns[i];
-		if (!columnsMap || (columnsMap.get(column))) {
-			if (column.dbNull === null)
-				sql = sql + separator + alias + '.' + util.format(columnFormat, column._dbName, column.alias);
-			else {
-				const encoded = column.encode.unsafe(column.dbNull);
-				sql = sql + separator + `CASE WHEN ${alias}.${column._dbName}=${encoded} THEN null ELSE ${alias}.${column._dbName} END as ${column.alias}`;
-			}
-			separator = ',';
-		}
-	}
-
-	return sql;
-}
-
-module.exports = _new;