orange-orm 5.2.4 → 5.3.1

package/src/table/column.js

@@ -28,18 +28,13 @@ function defineColumn(column, table) {
 		return c;
 	};
 
-	c.date = function() {
-		require('./column/date')(column);
-		return c;
-	};
-
 	c.dateWithTimeZone = function() {
 		require('./column/dateWithTimeZone')(column);
 		return c;
 	};
 
-	c.numeric = function(optionalPrecision,optionalScale) {
-		require('./column/numeric')(column,optionalPrecision,optionalScale);
+	c.numeric = function() {
+		require('./column/numeric')(column);
 		return c;
 	};
 

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

@@ -60,7 +60,7 @@ function newSingleCommandCore(context, table, filter, alias, concurrencyState) {
 		if (engine === 'pg') {
 			return newParameterized(columnSql + ' IS NOT DISTINCT FROM ' + encoded.sql(), encoded.parameters);
 		}
-		if (engine === 'mysql') {
+		if (engine === 'mysql' || engine === 'mariadb') {
 			return newParameterized(columnSql + ' <=> ' + encoded.sql(), encoded.parameters);
 		}
 		if (engine === 'sqlite') {
@@ -101,6 +101,10 @@ function newSingleCommandCore(context, table, filter, alias, concurrencyState) {
 			const jsonValue = JSON.stringify(value === undefined ? null : value);
 			return newParameterized('CAST(? AS JSON)', [jsonValue]);
 		}
+		if (engine === 'mariadb') {
+			const jsonValue = JSON.stringify(value === undefined ? null : value);
+			return newParameterized('JSON_EXTRACT(?, \'$\')', [jsonValue]);
+		}
 		if (engine === 'sqlite') {
 			if (isJsonObject(value)) {
 				const jsonValue = JSON.stringify(value);

package/src/table/commands/newInsertAndForgetCommand.js

@@ -3,8 +3,8 @@ var newImmutable = require('../../newImmutable');
 var createPatch = require('../../client/createPatch');
 var createDto = require('../resultToRows/toDto/createDto');
 
-function newInsertCommand(table, row, options) {
-	return new InsertCommand(table, row, options);
+function newInsertCommand(table, row) {
+	return new InsertCommand(table, row);
 }
 
 function InsertCommand(table, row) {

package/src/table/commands/newUpdateCommandCore.js

@@ -84,7 +84,7 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 		if (engine === 'pg') {
 			command = command.append(separator + columnSql + ' IS NOT DISTINCT FROM ').append(encoded);
 		}
-		else if (engine === 'mysql') {
+		else if (engine === 'mysql' || engine === 'mariadb') {
 			command = command.append(separator + columnSql + ' <=> ').append(encoded);
 		}
 		else if (engine === 'sqlite') {
@@ -123,7 +123,7 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 		if (engine === 'pg') {
 			command = command.append(separator).append(columnExpr).append(' IS NOT DISTINCT FROM ').append(encoded);
 		}
-		else if (engine === 'mysql') {
+		else if (engine === 'mysql' || engine === 'mariadb') {
 			command = command.append(separator).append(columnExpr).append(' <=> ').append(encoded);
 		}
 		else if (engine === 'sqlite') {
@@ -184,6 +184,11 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 			const sql = 'JSON_SET(' + expr.sql() + ', ' + jsonPath.sql + ', CAST(? AS JSON))';
 			return newParameterized(sql, expr.parameters.concat(jsonPath.parameters, [jsonValue]));
 		}
+		if (engine === 'mariadb') {
+			const jsonValue = JSON.stringify(value === undefined ? null : value);
+			const sql = 'JSON_SET(' + expr.sql() + ', ' + jsonPath.sql + ', JSON_EXTRACT(?, \'$\'))';
+			return newParameterized(sql, expr.parameters.concat(jsonPath.parameters, [jsonValue]));
+		}
 		if (engine === 'sqlite') {
 			const jsonValue = JSON.stringify(value === undefined ? null : value);
 			const sql = 'json_set(' + expr.sql() + ', ' + jsonPath.sql + ', json(?))';
@@ -208,7 +213,7 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 			const sql = expr.sql() + ' #- ' + pathLiteral;
 			return newParameterized(sql, expr.parameters);
 		}
-		if (engine === 'mysql') {
+		if (engine === 'mysql' || engine === 'mariadb') {
 			const sql = 'JSON_REMOVE(' + expr.sql() + ', ' + jsonPath.sql + ')';
 			return newParameterized(sql, expr.parameters.concat(jsonPath.parameters));
 		}
@@ -236,6 +241,12 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 			const sql = 'JSON_EXTRACT(' + columnSql + ', ' + jsonPath.sql + ')';
 			return newParameterized(sql, jsonPath.parameters);
 		}
+		if (engine === 'mariadb') {
+			const sql = isJsonObject(oldValue)
+				? 'JSON_EXTRACT(' + columnSql + ', ' + jsonPath.sql + ')'
+				: 'JSON_UNQUOTE(JSON_EXTRACT(' + columnSql + ', ' + jsonPath.sql + '))';
+			return newParameterized(sql, jsonPath.parameters);
+		}
 		if (engine === 'sqlite') {
 			const sql = 'json_extract(' + columnSql + ', ' + jsonPath.sql + ')';
 			return newParameterized(sql, jsonPath.parameters);
@@ -311,6 +322,15 @@ function newUpdateCommandCore(context, table, columns, row, concurrencyState) {
 			const jsonValue = JSON.stringify(value === undefined ? null : value);
 			return newParameterized('CAST(? AS JSON)', [jsonValue]);
 		}
+		if (engine === 'mariadb') {
+			if (isJsonObject(value)) {
+				const jsonValue = JSON.stringify(value);
+				return newParameterized('JSON_EXTRACT(?, \'$\')', [jsonValue]);
+			}
+			if (value === null || value === undefined)
+				return newParameterized('null');
+			return newParameterized('?', [String(value)]);
+		}
 		if (engine === 'sqlite') {
 			if (isJsonObject(value)) {
 				const jsonValue = JSON.stringify(value);

package/src/table/isJsonUpdateSupported.js

@@ -1,5 +1,5 @@
 function isJsonUpdateSupported(engine) {
-	return engine === 'pg' || engine === 'mysql' || engine === 'sqlite' || engine === 'mssql' || engine === 'mssqlNative' || engine === 'oracle';
+	return engine === 'pg' || engine === 'mysql' || engine === 'mariadb' || engine === 'sqlite' || engine === 'mssql' || engine === 'mssqlNative' || engine === 'oracle';
 }
 
 module.exports = isJsonUpdateSupported;

package/src/table/relatedTable/aggregate.js

@@ -1,10 +1,9 @@
 function newAggregate(_relations) {
 
 	function aggregate(context, fn) {
-		const includeMany = false;
-		let { relations, alias } = extract(includeMany, _relations);
+		let { relations, alias } = extract(_relations);
 		const table = relations[relations.length - 1].childTable;
-		if (!relations[0].isMany || includeMany)
+		if (!relations[0].isMany)
 			table._rootAlias = alias;
 
 		try {
@@ -19,11 +18,11 @@ function newAggregate(_relations) {
 	}
 	return aggregate;
 
-	function extract(includeMany, relations) {
+	function extract(relations) {
 		let alias = relations[0].toLeg().table._dbName;
 		let result = [];
 		for (let i = 0; i < relations.length; i++) {
-			if (relations[i].isMany && !includeMany) {
+			if (relations[i].isMany) {
 				result = [relations[i]];
 				alias = relations[i].toLeg().table._dbName;
 			}

package/src/table/relatedTable/where.js

@@ -3,10 +3,9 @@ const negotiateRawSqlFilter = require('../column/negotiateRawSqlFilter');
 function newWhere(_relations, _depth) {
 
 	function where(context, fn) {
-		const includeMany = false;
-		let { relations, alias } = extract(includeMany, _relations);
+		let { relations, alias } = extract(_relations);
 		const table = relations[relations.length - 1].childTable;
-		if (!relations[0].isMany || includeMany)
+		if (!relations[0].isMany)
 			table._rootAlias = alias;
 
 		try {
@@ -22,11 +21,11 @@ function newWhere(_relations, _depth) {
 	}
 	return where;
 
-	function extract(includeMany, relations) {
+	function extract(relations) {
 		let alias = relations[0].toLeg().table._dbName;
 		let result = [];
 		for (let i = 0; i < relations.length; i++) {
-			if (relations[i].isMany && !includeMany) {
+			if (relations[i].isMany) {
 				result = [relations[i]];
 				alias = relations[i].toLeg().table._dbName;
 			}

package/src/table/relation/newManyCacheCore.js

@@ -23,7 +23,7 @@ function newManyCache(joinRelation) {
 		}
 		var rows = newArray();
 		rows.push(childRow);
-		existing = cache.tryAdd(key, rows);
+		cache.tryAdd(key, rows);
 	}
 
 	function newArray() {

package/src/table/resultToRows/dbRowToRow.js

@@ -4,6 +4,10 @@ var decodeDbRow = require('./decodeDbRow');
 function dbRowToRow(context, span, dbRow) {
 	var table = span.table;
 	var row = decodeDbRow(context, span, table, dbRow);
+	if (!hasPrimaryKey(row, table)) {
+		skipNestedLegs(span, dbRow);
+		return null;
+	}
 	var cache = table._cache;
 	if (!cache.tryGet(context, row)) {
 		var queryContext = span.queryContext;
@@ -20,13 +24,15 @@ function dbRowToRow(context, span, dbRow) {
 	var c = {};
 
 	c.visitOne = function(leg) {
-		dbRowToRow(context, leg.span, dbRow);
-		leg.expand(row);
+		let child = dbRowToRow(context, leg.span, dbRow);
+		if (child)
+			leg.expand(row);
 	};
 
 	c.visitJoin = function(leg) {
-		dbRowToRow(context, leg.span, dbRow);
-		leg.expand(row);
+		let child = dbRowToRow(context, leg.span, dbRow);
+		if (child)
+			leg.expand(row);
 	};
 
 	c.visitMany = function() {
@@ -41,4 +47,31 @@ function dbRowToRow(context, span, dbRow) {
 	return row;
 }
 
-module.exports = dbRowToRow;
+function hasPrimaryKey(row, table) {
+	return table._primaryColumns.every((column) => {
+		let value = row[column.alias];
+		return value !== null && value !== undefined;
+	});
+}
+
+function skipNestedLegs(span, dbRow) {
+	span.legs.forEach((leg) => {
+		leg.accept({
+			visitOne() {
+				skipSpan(leg.span, dbRow);
+			},
+			visitJoin() {
+				skipSpan(leg.span, dbRow);
+			},
+			visitMany() {
+			}
+		});
+	});
+}
+
+function skipSpan(span, dbRow) {
+	decodeDbRow(undefined, span, span.table, dbRow);
+	skipNestedLegs(span, dbRow);
+}
+
+module.exports = dbRowToRow;

package/src/tedious/newTransaction.js

@@ -19,6 +19,7 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 		rdb.pool = pool;
 	}
 	rdb.engine = 'mssql';
+	rdb.maxParameters = 2100;
 	rdb.encodeBoolean = encodeBoolean;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
@@ -114,4 +115,4 @@ function decodeJSON(value){
 	return JSON.parse(value);
 }
 
-module.exports = newResolveTransaction;
+module.exports = newResolveTransaction;

package/src/table/query/extractLimitQuery.js

@@ -1,23 +0,0 @@
-var newWhereSql = require('./singleQuery/newWhereSql');
-var negotiateLimit = require('./singleQuery/negotiateLimit');
-var newParameterized = require('./newParameterized');
-var getSessionContext = require('../getSessionContext');
-
-function _new(table, filter, span, alias, orderBy, limit) {
-	//unused ?
-
-	if (!limit)
-		return;
-	var whereSql = newWhereSql(table, filter, alias);
-	var safeLimit = negotiateLimit(limit);
-	var sql;
-	if (getSessionContext().limit === 'TOP') {
-		safeLimit = safeLimit.replace('limit', 'top');
-		sql = 'select ' + safeLimit + ' * from ' + table._dbName + ' ' + alias + whereSql + orderBy;
-	}
-	sql = 'select * from ' + table._dbName + ' ' + alias + whereSql + orderBy + safeLimit;
-
-	return newParameterized(sql, filter.parameters);
-}
-
-module.exports = _new;