orange-orm 5.3.6 → 5.4.0-beta

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

@@ -0,0 +1,74 @@
+const getSessionSingleton = require('../../getSessionSingleton');
+
+function selectLockSql(context, span, alias, exclusive) {
+	const lock = collectSelectLock(span, alias, exclusive);
+	if (!hasLock(lock))
+		return '';
+	const encode = getSessionSingleton(context, 'selectForUpdateSql');
+	if (!encode)
+		return '';
+	return encode(context, lock);
+}
+
+function tableHintSql(context, span, exclusive) {
+	const lock = spanToLock(span, exclusive);
+	if (!hasLock(lock))
+		return '';
+	const encode = getSessionSingleton(context, 'selectForUpdateSql');
+	if (!encode || !encode.tableHint)
+		return '';
+	return encode.tableHint(context, lock);
+}
+
+function collectSelectLock(span, alias, exclusive) {
+	const lock = {
+		aliases: [],
+		forUpdate: Boolean(exclusive),
+		skipLocked: false
+	};
+	collect(span, alias, lock);
+	if (exclusive && lock.aliases.indexOf(alias) === -1)
+		lock.aliases.unshift(alias);
+	return lock;
+}
+
+function collect(span, alias, lock) {
+	if (!span)
+		return;
+	if (span.forUpdate) {
+		lock.forUpdate = true;
+		lock.aliases.push(alias);
+	}
+	if (span.skipLocked)
+		lock.skipLocked = true;
+
+	if (!span.legs)
+		return;
+	const visitor = {};
+	visitor.visitJoin = visitJoinedLeg;
+	visitor.visitOne = visitJoinedLeg;
+	visitor.visitMany = function() {};
+
+	function visitJoinedLeg(leg) {
+		collect(leg.span, alias + leg.name, lock);
+	}
+
+	span.legs.forEach(leg => leg.accept(visitor));
+}
+
+function spanToLock(span, exclusive) {
+	return {
+		aliases: [],
+		forUpdate: Boolean(exclusive || span?.forUpdate),
+		skipLocked: Boolean(span?.skipLocked)
+	};
+}
+
+function hasLock(lock) {
+	return Boolean(lock.forUpdate || lock.skipLocked);
+}
+
+module.exports = {
+	selectLockSql,
+	tableHintSql
+};

package/src/table/tryGetFromDbById.js

@@ -1,21 +1,27 @@
 var newPrimaryKeyFilter = require('./newPrimaryKeyFilter');
-var tryGetFirstFromDb = require('./tryGetFirstFromDb');
+var getMany = require('./getMany');
 var extractStrategy = require('./tryGetFromDbById/extractStrategy');
 
 function tryGet(context) {
 	var filter = newPrimaryKeyFilter.apply(null, arguments);
 	var table = arguments[1];
 	var strategy = extractStrategy.apply(null, arguments);
-	return tryGetFirstFromDb(context, table, filter, strategy);
+	return getMany(context, table, filter, strategy).then(filterRows);
 }
 
 tryGet.exclusive = function tryGet(context) {
 	var filter = newPrimaryKeyFilter.apply(null, arguments);
 	var table = arguments[1];
 	var strategy = extractStrategy.apply(null, arguments);
-	return tryGetFirstFromDb.exclusive(context, table, filter, strategy);
+	return getMany.exclusive(context, table, filter, strategy).then(filterRows);
 
 
 };
 
+function filterRows(rows) {
+	if (rows.length > 0)
+		return rows[0];
+	return null;
+}
+
 module.exports = tryGet;

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

@@ -1,12 +1,14 @@
 var newColumnSql = require('./singleQuery/newShallowColumnSql');
 var newWhereSql = require('../../../table/query/singleQuery/newWhereSql');
 var newParameterized = require('../../../table/query/newParameterized');
+var lockSql = require('../../../table/query/singleQuery/lockSql');
 
 function _new(context, table, filter, span, alias, subQueries, orderBy, limit, offset) {
 	var columnSql = newColumnSql(context, table, alias, span);
 	var whereSql = newWhereSql(context, table, filter, alias);
 	if (limit)
 		limit = limit + ' ';
+	const tableHint = lockSql.tableHintSql(context, span);
 
 	let join = '';
 	const set = new Set();
@@ -21,7 +23,7 @@ function _new(context, table, filter, span, alias, subQueries, orderBy, limit, o
 	}
 
 
-	return newParameterized('select ' + limit + columnSql).append(subQueries).append(' from ' + `[${table._dbName}] [${alias}]` + join).append(whereSql).append(orderBy + offset);
+	return newParameterized('select ' + limit + columnSql).append(subQueries).append(' from ' + `[${table._dbName}] [${alias}]` + tableHint + join).append(whereSql).append(orderBy + offset);
 }
 
-module.exports = _new;
+module.exports = _new;

package/src/tedious/selectForUpdateSql.js

@@ -1,5 +1,18 @@
-const quote = require('../table/quote');
+function selectForUpdateSql() {
+	return '';
+}
 
-module.exports = function(alias) {
-	return ' FOR UPDATE OF ' + quote(alias);
-};
+selectForUpdateSql.tableHint = function(_context, lock) {
+	const hints = [];
+	if (lock.forUpdate)
+		hints.push('UPDLOCK');
+	if (lock.skipLocked) {
+		hints.push('READPAST');
+		hints.push('ROWLOCK');
+	}
+	if (hints.length === 0)
+		return '';
+	return ' WITH (' + hints.join(', ') + ')';
+};
+
+module.exports = selectForUpdateSql;