orange-orm 4.0.1 → 4.1.0

package/docs/changelog.md

@@ -1,5 +1,8 @@
 ## Changelog
-__4.0.1_  
+__4.1.0__  
+Escape table and column names.  [#91](https://github.com/alfateam/orange-orm/issues/91)  [#92](https://github.com/alfateam/orange-orm/issues/92)  
+NotNullable relations [#104](https://github.com/alfateam/orange-orm/issues/104)  
+__4.0.1__  
 Inhouse definitions of ajv to avoid trouble with nestjs.  
 __4.0.0__  
 Changed the behaviour of `update` to accept a `where` filter and only update passed in columns and relations. The previous behaviour of `update` has moved to `replace` method.  
@@ -464,4 +467,4 @@ Improved sql compression on insert/update.
 __0.2.4__  
 Bugfix: getMany with many-strategy and shallowFilter yields incorrect query #6.  
 __0.2.3__  
-Reformatted documentation. No code changes.  
+Reformatted documentation. No code changes.  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "main": "./src/index.js",
   "browser": "./src/client/index.mjs",
   "bin": {

package/src/getManyDto/query/newSingleQuery.js

@@ -2,17 +2,18 @@ var newColumnSql = require('../../table/query/singleQuery/newColumnSql');
 var newWhereSql = require('../../table/query/singleQuery/newWhereSql');
 var newJoinSql = require('../../table/query/singleQuery/newJoinSql');
 var newParameterized = require('../../table/query/newParameterized');
+var getSessionSingleton = require('../../table/getSessionSingleton');
 
 function _new(table,filter,span, alias,orderBy,limit,offset) {
-//todo
-	var name = table._dbName;
+	var quote = getSessionSingleton('quote');
+	var name = quote(table._dbName);
 	var columnSql = newColumnSql(table,span,alias,true);
 	var joinSql = newJoinSql(span, alias);
 	var whereSql = newWhereSql(table,filter,alias);
 	if (limit)
 		limit = limit + ' ';
 
-	return newParameterized('select ' + limit + columnSql + ' from ' + name + ' ' + alias).append(joinSql).append(whereSql).append(orderBy + offset);
+	return newParameterized('select ' + limit + columnSql + ' from ' + name + ' ' + quote(alias)).append(joinSql).append(whereSql).append(orderBy + offset);
 
 }
 

package/src/map.d.ts

@@ -837,7 +837,7 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column4: C4,
 			column5: C5,
 			column6: C6
-		): MappedTableDef<TTo> & RelatedTable;
+		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
 	}
 	: 5 extends TPrimaryCount
 	? {
@@ -847,7 +847,7 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column3: C3,
 			column4: C4,
 			column5: C5
-		): MappedTableDef<TTo> & RelatedTable;
+		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
 	}
 	: 4 extends TPrimaryCount
 	? {
@@ -856,7 +856,7 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column2: C2,
 			column3: C3,
 			column4: C4
-		): MappedTableDef<TTo> & RelatedTable;
+		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
 	}
 	: 3 extends TPrimaryCount
 	? {
@@ -864,23 +864,25 @@ type ReferenceMapperHelper<TFrom, TTo, TPrimaryCount> =
 			column: C1,
 			column2: C2,
 			column3: C3
-		): MappedTableDef<TTo> & RelatedTable;
+		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
 	}
 	: 2 extends TPrimaryCount
 	? {
 		by<C1 extends keyof KeyCandidates1<TFrom, TTo>, C2 extends keyof KeyCandidates2<TFrom, TTo>>(
 			column: C1,
 			column2: C2
-		): MappedTableDef<TTo> & RelatedTable;
+		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
 	}
 	: 1 extends TPrimaryCount
 	? {
 		by<C1 extends keyof KeyCandidates1<TFrom, TTo>>(
 			column: C1
-		): MappedTableDef<TTo> & RelatedTable;
+		): MappedTableDef<TTo> & RelatedTable & NegotiateNotNullColumn<C1,TFrom>;
 	}
 	: {};
 
+type NegotiateNotNullColumn<C, TFrom> = C extends keyof TFrom ? TFrom[C] extends NotNullExceptInsert ? NotNullExceptInsert : TFrom[C] extends NotNull ? NotNull : {}: {};
+
 type HasMapperHelper<
 	TFrom,
 	TTo,
@@ -895,7 +897,7 @@ type HasMapperHelper<
 			column4: keyof KeyCandidates4<TTo, TFrom>,
 			column5: keyof KeyCandidates5<TTo, TFrom>,
 			column6: keyof KeyCandidates6<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 5 extends TPrimaryCount
 	? {
@@ -905,7 +907,7 @@ type HasMapperHelper<
 			column3: keyof KeyCandidates3<TTo, TFrom>,
 			column4: keyof KeyCandidates4<TTo, TFrom>,
 			column5: keyof KeyCandidates5<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 4 extends TPrimaryCount
 	? {
@@ -914,7 +916,7 @@ type HasMapperHelper<
 			column2: keyof KeyCandidates2<TTo, TFrom>,
 			column3: keyof KeyCandidates3<TTo, TFrom>,
 			column4: keyof KeyCandidates4<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 3 extends TPrimaryCount
 	? {
@@ -922,23 +924,28 @@ type HasMapperHelper<
 			column: keyof KeyCandidates1<TTo, TFrom>,
 			column2: keyof KeyCandidates2<TTo, TFrom>,
 			column3: keyof KeyCandidates3<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 2 extends TPrimaryCount
 	? {
 		by(
 			column: keyof KeyCandidates1<TTo, TFrom>,
 			column2: keyof KeyCandidates2<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: 1 extends TPrimaryCount
 	? {
 		by(
 			column: keyof KeyCandidates1<TTo, TFrom>
-		): MappedTableDef<TTo> & RelatedTable & TExtra;
+		): MappedTableDef<TTo> & RelatedTable & TExtra & HasMapperHelper2<MappedTableDef<TTo> & RelatedTable & TExtra>;
 	}
 	: {};
 
+type HasMapperHelper2<T> = {
+	notNull(): T & NotNull;
+	notNullExceptInsert(): T & NotNull & NotNullExceptInsert;
+}
+
 type ColumnMapperInit<T> = {
 	column(columnName: string): ColumnType<{}>;
 	primaryColumn(columnName: string): ColumnType<IsPrimary>;

package/src/mssql/newTransaction.js

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

package/src/mySql/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/mySql/insertSql.js

@@ -1,9 +1,12 @@
+const getSessionSingleton = require('../table/getSessionSingleton');
+
 function insertSql(table, row, options) {
+	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];
-	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	let sql = 'INSERT INTO ' + quote(table._dbName) + ' ';
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0) {
@@ -25,7 +28,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]);
 		}
 	}
@@ -35,25 +38,29 @@ 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);
+			regularColumnNames.push(columnName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
+				columnNames.push(columnName);
 				values.push('%s');
 				addConflictUpdate(column);
 			}
 		}
 		if (conflictColumnUpdates.length === 0) {
 			const column = table._primaryColumns[0];
-			conflictColumnUpdates.push(`${column._dbName}=VALUES(${column._dbName})`);
+			const columnName = quote(column._dbName);
+			conflictColumnUpdates.push(`${columnName}=VALUES(${columnName})`);
 		}
 		conflictColumnUpdateSql = conflictColumnUpdates.join(',');
 
 		function addConflictUpdate(column) {
 			let concurrency = options[column.alias]?.concurrency || options.concurrency;
+			const columnName = quote(column._dbName);
+			const tableName = quote(table._dbName);
 			if (concurrency === 'overwrite') {
-				conflictColumnUpdates.push(`${column._dbName}=VALUES(${column._dbName})`);
+				conflictColumnUpdates.push(`${columnName}=VALUES(${columnName})`);
 			} else if (concurrency === 'optimistic') {
-				conflictColumnUpdates.push(`${column._dbName} = CASE WHEN ${table._dbName}.${column._dbName} <> VALUES(${column._dbName}) THEN CAST('12345678-1234-1234-1234-123456789012Conflict when updating ${column._dbName}12345678-1234-1234-1234-123456789012' AS SIGNED) ELSE ${table._dbName}.${column._dbName} END`);
+				conflictColumnUpdates.push(`${columnName} = CASE WHEN ${tableName}.${columnName} <> VALUES(${columnName}) THEN CAST('12345678-1234-1234-1234-123456789012Conflict when updating ${columnName}12345678-1234-1234-1234-123456789012' AS SIGNED) ELSE ${tableName}.${columnName} END`);
 			}
 		}
 	}

package/src/mySql/lastInsertedSql.js

@@ -1,8 +1,11 @@
+const getSessionSingleton = require('../table/getSessionSingleton');
+
 function lastInsertedSql(table, keyValues) {
+	const quote = getSessionSingleton('quote');
 	return keyValues.map((value,i) => {
 		let column = table._primaryColumns[i];
 		if (value === undefined && column.tsType === 'NumberColumn')
-			return `${column._dbName}=LAST_INSERT_ID()`;
+			return `${quote(column._dbName)}=LAST_INSERT_ID()`;
 		else
 			return column.eq(value);
 	});

package/src/mySql/newTransaction.js

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

package/src/oracle/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/oracle/formatDateOut.js

@@ -1,5 +1,7 @@
+const quote = require('../table/quote');
+
 function formatDateColumn(column, alias) {
-	return `TO_CHAR(${alias}.${column._dbName}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3')`;
+	return `TO_CHAR(${alias}.${quote(column._dbName)}, 'YYYY-MM-DD"T"HH24:MI:SS.FF3')`;
 }
 
 module.exports = formatDateColumn;

package/src/oracle/insertSql.js

@@ -1,5 +1,6 @@
 let outputInsertedSql = require('./outputInsertedSql');
 let mergeSql = require('./mergeSql');
+const getSessionSingleton = require('../table/getSessionSingleton');
 
 function getSqlTemplate(_table, _row, options) {
 	if (hasConcurrency(_table, options) && hasColumns())
@@ -26,14 +27,15 @@ function hasConcurrency(table,options) {
 }
 
 function insertSql(table, row) {
+	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let regularColumnNames = [];
 	let values = [];
-	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	let sql = 'INSERT INTO "' + table._dbName + '" ';
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0)
-		sql += `${outputInserted()} (${table._primaryColumns[0]._dbName}) VALUES(DEFAULT)`;
+		sql += `${outputInserted()} (${quote(table._primaryColumns[0]._dbName)}) VALUES(DEFAULT)`;
 	else
 		sql = sql + '('+ columnNames.join(',') + ')' + outputInserted() +  'VALUES (' + values.join(',') + ')';
 	return sql;
@@ -42,7 +44,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(quote(parts[0]));
 			values.push(parts[1]);
 		}
 	}
@@ -51,9 +53,10 @@ function insertSql(table, row) {
 		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);
+			regularColumnNames.push(columnName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
+				columnNames.push(columnName);
 				if (column.tsType === 'DateColumn')
 					values.push('TO_TIMESTAMP(%s, \'YYYY-MM-DD"T"HH24:MI:SS.FF6\')');
 				else

package/src/oracle/mergeSql.js

@@ -1,6 +1,8 @@
 const outputInsertedSql = require('./outputInsertedSql');
+const getSessionSingleton = require('../table/getSessionSingleton');
 
 function insertSql(table, row, options) {
+	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';
@@ -11,18 +13,17 @@ function insertSql(table, row, options) {
 	const matched = whenMatched();
 	let sql;
 	if (matched)
-		sql = `MERGE INTO ${table._dbName} target USING (SELECT ${values.join(',')} FROM DUAL) source ON (${join()}) WHEN MATCHED THEN ${matched} WHEN NOT MATCHED THEN ${whenNotMatched()} ${outputInsertedSql(table)}`;
+		sql = `MERGE INTO ${quote(table._dbName)} target USING (SELECT ${values.join(',')} FROM DUAL) source ON (${join()}) WHEN MATCHED THEN ${matched} WHEN NOT MATCHED THEN ${whenNotMatched()} ${outputInsertedSql(table)}`;
 	else
-		sql = `MERGE INTO ${table._dbName} target USING (SELECT ${values.join(',')} FROM DUAL) source ON (${join()}) WHEN NOT MATCHED THEN ${whenNotMatched()} ${outputInsertedSql(table)}`;
+		sql = `MERGE INTO ${quote(table._dbName)} target USING (SELECT ${values.join(',')} FROM DUAL) 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];
-
-			return `target.${name}=source.${name}`;
+			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 ');
 	}
 
@@ -41,8 +42,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]} ${parts[0]}`);
+			columnNames.push(quote(parts[0]));
+			values.push(`${parts[1]} ${quote(parts[0])}`);
 		}
 	}
 
@@ -51,10 +52,11 @@ 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);
+			regularColumnNames.push(columnName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
-				values.push(`%s ${column.alias}`);
+				columnNames.push(columnName);
+				values.push(`%s ${quote(column.alias)}`);
 				if (!column.isPrimary)
 					addConflictUpdate(column);
 			}
@@ -66,11 +68,12 @@ 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 RAISE_APPLICATION_ERROR(-20001, 'Conflict when updating ${column._dbName}') ELSE target.${column._dbName} END`);
-				conflictColumnUpdates.push(`target.${column._dbName} = CASE WHEN target.${column._dbName} <> source.${column._dbName} THEN 1/0 ELSE target.${column._dbName} END`);
+				conflictColumnUpdates.push(`target.${columnName} = CASE WHEN target.${columnName} <> source.${columnName} THEN 1/0 ELSE target.${columnName} END`);
 
 		}
 	}

package/src/oracle/newTransaction.js

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

package/src/oracle/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/pg/deleteFromSql.js

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

package/src/pg/formatDateOut.js

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

package/src/pg/insertSql.js

@@ -1,12 +1,14 @@
 let lastInsertedSql = require('./lastInsertedSql');
 let getSessionContext = require('../table/getSessionContext');
+const getSessionSingleton = require('../table/getSessionSingleton');
 
 function insertSql(table, row, options) {
+	const quote = getSessionSingleton('quote');
 	let columnNames = [];
 	let regularColumnNames = [];
 	let conflictColumnUpdateSql = '';
 	let values = [];
-	let sql = 'INSERT INTO ' + table._dbName + ' ';
+	let sql = 'INSERT INTO ' + quote(table._dbName) + ' ';
 	addDiscriminators();
 	addColumns();
 	if (columnNames.length === 0)
@@ -17,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 '';
@@ -27,7 +29,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]);
 		}
 	}
@@ -37,9 +39,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);
+			regularColumnNames.push(columnName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
+				columnNames.push(columnName);
 				values.push('%s');
 				addConflictUpdate(column);
 			}
@@ -51,10 +54,12 @@ function insertSql(table, row, options) {
 
 		function addConflictUpdate(column) {
 			let concurrency = options[column.alias]?.concurrency || options.concurrency;
+			const columnName = quote(column._dbName);
+			const tableName = quote(table._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 CAST(random()::int || '12345678-1234-1234-1234-123456789012Conflict when updating ${column._dbName}12345678-1234-1234-1234-123456789012' AS INTEGER) ELSE ${table._dbName}.${column._dbName} END`);
+				conflictColumnUpdates.push(`${columnName} = CASE WHEN ${tableName}.${columnName} <> EXCLUDED.${columnName} THEN CAST(random()::int || '12345678-1234-1234-1234-123456789012Conflict when updating ${columnName}12345678-1234-1234-1234-123456789012' AS INTEGER) ELSE ${tableName}.${columnName} END`);
 		}
 	}
 

package/src/pg/lastInsertedSql.js

@@ -1,8 +1,11 @@
+const getSessionSingleton = require('../table/getSessionSingleton');
+
 function lastInsertedSql(table) {
+	const quote = getSessionSingleton('quote');
 	let separator = '';
 	let result = 'RETURNING ';
 	for (let i = 0; i < table._columns.length; i++) {
-		result += separator + table._columns[i]._dbName;
+		result += separator + quote(table._columns[i]._dbName);
 		separator = ',';
 	}
 	return result;

package/src/pg/newTransaction.js

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

package/src/pg/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/sap/deleteFromSql.js

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

package/src/sap/formatDateOut.js

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

package/src/sap/insertSql.js

@@ -1,3 +1,4 @@
+const getSessionSingleton = require('../table/getSessionSingleton');
 const mergeSql = require('./mergeSql');
 
 function getSqlTemplate(_table, _row, options) {
@@ -26,10 +27,11 @@ function hasConcurrency(table,options) {
 }
 
 function insertSql(table, row) {
+	const quote = getSessionSingleton('quote');
 	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)
@@ -42,7 +44,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(quote(parts[0]));
 			values.push(parts[1]);
 		}
 	}
@@ -51,9 +53,10 @@ function insertSql(table, row) {
 		let columns = table._columns;
 		for (let i = 0; i < columns.length; i++) {
 			let column = columns[i];
+			const columnName = quote(column._dbName);
 			regularColumnNames.push(column._dbName);
 			if (row['__' + column.alias] !== undefined) {
-				columnNames.push(column._dbName);
+				columnNames.push(columnName);
 				values.push('%s');
 			}
 		}