orange-orm 4.7.10-beta.3 → 4.7.11-beta.0

package/src/table/commands/newGetLastInsertedCommandCore.js

@@ -10,7 +10,17 @@ function newGetLastInsertedCommandCore(context, table, row) {
 	return newParameterized(sql, parameters);
 
 	function columnNames() {
-		return table._columns.map(col => quote(context, col._dbName)).join(',');
+		return table._columns.map(formatColumn).join(',');
+	}
+
+	function formatColumn(column) {
+		const formatted = column.formatOut ? column.formatOut(context)  + ' as ' + quote(context, column._dbName) :  quote(context, column._dbName);
+		if (column.dbNull === null)
+			return formatted;
+		else {
+			const encoded = column.encode.unsafe(context, column.dbNull);
+			return `CASE WHEN ${formatted}=${encoded} THEN null ELSE ${formatted} END`;
+		}
 	}
 
 	function whereSql() {

package/src/table/commands/newInsertCommandCore.js

@@ -13,7 +13,7 @@ function newInsertCommandCore(context, table, row, options = {}) {
 		if (row['__' + column.alias] !== undefined) {
 			let encoded = column.encode(context, row[alias]);
 			if (encoded.parameters.length > 0) {
-				values.push('?');
+				values.push(encoded.sql());
 				parameters.push(encoded.parameters[0]);
 			} else
 				values.push(encoded.sql());

package/src/tedious/formatBigintOut.js

@@ -0,0 +1,11 @@
+const quote = require('./quote');
+
+function formatBigintOut(column, alias) {
+	const quotedCol = quote(column._dbName);
+	if (alias)
+		return `CAST(${alias}.${quotedCol} AS NVARCHAR(20))`;
+	else
+		return `CAST(${quotedCol} AS NVARCHAR(20))`;
+}
+
+module.exports = formatBigintOut;

package/src/tedious/formatDateOut.js

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

package/src/tedious/formatJSONOut.js

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

package/src/tedious/insertSql.js

@@ -1,11 +1,11 @@
 let outputInsertedSql = require('./outputInsertedSql');
 let mergeSql = require('./mergeSql');
 
-function getSqlTemplate(_context, _table, _row, options) {
+function getSqlTemplate(context, _table, _row, options) {
 	if (hasConcurrency(_table, options) && hasColumns())
-		return mergeSql.apply(null, [...arguments].slice(1));
+		return mergeSql.apply(null, [...arguments]);
 	else
-		return insertSql.apply(null, [...arguments].slice(1));
+		return insertSql.apply(null, [...arguments]);
 
 	function hasColumns() {
 		for(let p in _row) {
@@ -25,7 +25,7 @@ function hasConcurrency(table,options) {
 	return options.concurrency === 'skipOnConflict' || options.concurrency === 'overwrite';
 }
 
-function insertSql(table, row) {
+function insertSql(context, table, row) {
 	let columnNames = [];
 	let values = [];
 	let sql = `INSERT INTO [${table._dbName}] `;
@@ -60,7 +60,7 @@ function insertSql(table, row) {
 
 	function outputInserted() {
 
-		return ' ' + outputInsertedSql(table) + ' ';
+		return ' ' + outputInsertedSql(context, table) + ' ';
 	}
 
 }

package/src/tedious/mergeSql.js

@@ -1,6 +1,6 @@
 const outputInsertedSql = require('./outputInsertedSql');
 
-function insertSql(table, row, options) {
+function insertSql(context, table, row, options) {
 
 	let columnNames = [];
 	let conflictColumnUpdateSql = '';
@@ -11,9 +11,9 @@ 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(context, 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(context, table)};`;
 	return sql;
 
 	function join() {

package/src/tedious/newTransaction.js

@@ -6,6 +6,7 @@ const limitAndOffset = require('./limitAndOffset');
 const insertSql = require('./insertSql');
 const getManyDto = require('./getManyDto');
 const formatDateOut = require('./formatDateOut');
+const formatBigintOut = require('./formatBigintOut');
 const formatJSONOut = require('./formatJSONOut');
 const insert = require('./insert');
 const quote = require('./quote');
@@ -27,6 +28,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	rdb.insertSql = insertSql;
 	rdb.insert = insert;
 	rdb.formatDateOut = formatDateOut;
+	rdb.formatBigintOut = formatBigintOut;
 	rdb.formatJSONOut = formatJSONOut;
 	rdb.multipleStatements = true;
 	rdb.begin = 'BEGIN TRANSACTION';

package/src/tedious/outputInsertedSql.js

@@ -1,11 +1,20 @@
-function outputInsertedSql(table) {
+function outputInsertedSql(context, table) {
 	let separator = '';
 	let result = 'OUTPUT ';
 	for (let i = 0; i < table._columns.length; i++) {
-		result += separator + 'INSERTED.[' + table._columns[i]._dbName + ']';
+		result += separator + formatColumn(table._columns[i]);
 		separator = ',';
 	}
 	return result;
+
+	function formatColumn(column) {
+		if (column.formatOut)
+			return column.formatOut(context, 'INSERTED');
+		else
+			return `INSERTED.[${column._dbName}]`;
+	}
 }
 
+
+
 module.exports = outputInsertedSql;

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

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