orange-orm 5.2.4 → 5.3.1

package/README.md

@@ -27,6 +27,7 @@ The ultimate Object Relational Mapper for Node.js, Bun and Deno, offering seamle
 | PGlite      | ✅ | ✅ | ✅ | ✅ | ✅
 | MS SQL        | ✅ |  | ✅ | |
 | MySQL         | ✅ | ✅ | ✅ || 
+| MariaDB       | ✅ | ✅ | ✅ ||
 | Oracle        | ✅ | ✅ | ✅ | |
 | SAP ASE       | ✅ |  |  | |
 | SQLite        | ✅ | ✅ | ✅ | |
@@ -350,6 +351,15 @@ import map from './map';
 const db = map.mysql('mysql://test:test@mysql/test');
 ```
 
+__MariaDB__
+```bash
+$ npm install mysql2
+```  
+```javascript
+import map from './map';
+const db = map.mariadb('mariadb://test:test@mariadb/test');
+```
+
 
 __MS SQL__
 ```bash

package/deno.lock

@@ -0,0 +1,75 @@
+{
+  "version": "5",
+  "specifiers": {
+    "jsr:@std/assert@*": "1.0.19",
+    "jsr:@std/assert@^1.0.17": "1.0.19",
+    "jsr:@std/internal@^1.0.12": "1.0.12",
+    "jsr:@std/path@*": "1.1.4",
+    "jsr:@std/testing@*": "1.0.17"
+  },
+  "jsr": {
+    "@std/assert@1.0.19": {
+      "integrity": "eaada96ee120cb980bc47e040f82814d786fe8162ecc53c91d8df60b8755991e",
+      "dependencies": [
+        "jsr:@std/internal"
+      ]
+    },
+    "@std/internal@1.0.12": {
+      "integrity": "972a634fd5bc34b242024402972cd5143eac68d8dffaca5eaa4dba30ce17b027"
+    },
+    "@std/path@1.1.4": {
+      "integrity": "1d2d43f39efb1b42f0b1882a25486647cb851481862dc7313390b2bb044314b5",
+      "dependencies": [
+        "jsr:@std/internal"
+      ]
+    },
+    "@std/testing@1.0.17": {
+      "integrity": "87bdc2700fa98249d48a17cd72413352d3d3680dcfbdb64947fd0982d6bbf681",
+      "dependencies": [
+        "jsr:@std/assert@^1.0.17",
+        "jsr:@std/internal"
+      ]
+    }
+  },
+  "workspace": {
+    "packageJson": {
+      "dependencies": [
+        "npm:@cloudflare/workers-types@^4.20241106.0",
+        "npm:@electric-sql/pglite@0.3",
+        "npm:@hono/node-server@^1.14.4",
+        "npm:@lroal/on-change@^4.0.2",
+        "npm:@rollup/plugin-commonjs@^28.0.2",
+        "npm:@rollup/plugin-json@^6.1.0",
+        "npm:@rollup/plugin-node-resolve@13",
+        "npm:@tediousjs/connection-string@~0.4.1",
+        "npm:@types/express@^4.17.13",
+        "npm:@types/oracledb@^6.0.4",
+        "npm:@types/tedious@^4.0.14",
+        "npm:@typescript-eslint/eslint-plugin@^8.56.1",
+        "npm:@typescript-eslint/parser@^8.56.1",
+        "npm:@vitest/coverage-v8@^3.2.4",
+        "npm:ajv@^8.17.1",
+        "npm:axios@^1.6.2",
+        "npm:better-sqlite3@^12.6.2",
+        "npm:cors@^2.8.5",
+        "npm:eslint-plugin-jest@^29.15.0",
+        "npm:eslint@^8.57.0",
+        "npm:express@^4.18.2",
+        "npm:fast-json-patch@^3.1.1",
+        "npm:hono@^4.8.2",
+        "npm:msnodesqlv8@^4.1.0",
+        "npm:mysql2@^3.9.4",
+        "npm:oracledb@^6.3.0",
+        "npm:owasp-dependency-check@^0.0.21",
+        "npm:pg-query-stream@^3.3.2",
+        "npm:pg@^8.5.1",
+        "npm:rfdc@^1.2.0",
+        "npm:rollup@^2.52.7",
+        "npm:tedious@19",
+        "npm:typescript@^5.4.5",
+        "npm:uuid@^8.3.2 || 9 || 10 || ^11.1.0",
+        "npm:vitest@^3.2.4"
+      ]
+    }
+  }
+}

package/dist/index.browser.mjs

@@ -3049,6 +3049,7 @@ function requireClientMap () {
 		dbMap.mssql = throwDb;
 		dbMap.mssqlNative = throwDb;
 		dbMap.mysql = throwDb;
+		dbMap.mariadb = throwDb;
 		dbMap.sap = throwDb;
 		dbMap.oracle = throwDb;
 		dbMap.sqlite = throwDb;
@@ -3077,6 +3078,7 @@ function requireClientMap () {
 		onFinal.mssql = () => index({ db: throwDb, providers: dbMap });
 		onFinal.mssqlNative = () => index({ db: throwDb, providers: dbMap });
 		onFinal.mysql = () => index({ db: throwDb, providers: dbMap });
+		onFinal.mariadb = () => index({ db: throwDb, providers: dbMap });
 		onFinal.sap = () => index({ db: throwDb, providers: dbMap });
 		onFinal.oracle = () => index({ db: throwDb, providers: dbMap });
 		onFinal.sqlite = () => index({ db: throwDb, providers: dbMap });
@@ -3234,6 +3236,7 @@ function requireClient () {
 		client.oracle = onProvider.bind(null, 'oracle');
 		client.http = onProvider.bind(null, 'http');//todo
 		client.mysql = onProvider.bind(null, 'mysql');
+		client.mariadb = onProvider.bind(null, 'mariadb');
 		client.express = express;
 		client.hono = hono;
 		client.close = close;
@@ -4254,7 +4257,7 @@ function requireClient () {
 					if (arguments[i][isColumnProxyKey])
 						args[i] = { [columnRefKey]: arguments[i][columnPathKey] };
 					else
-						args[i] = arguments[i](tableProxy(path.split('.').slice(0, -1).join('.')));
+						args[i] = arguments[i](tableProxy());
 				}
 				else
 					args[i] = arguments[i];
@@ -4972,7 +4975,7 @@ function requireNewLikeColumnArg () {
 		var encodedSuffix = suffix ? column.encode(context, suffix) : null;
 		var engine = getSessionSingleton(context, 'engine');
 
-		if (engine === 'mysql')
+		if (engine === 'mysql' || engine === 'mariadb')
 			return concatWithFunction(encodedPrefix, encodedArg, encodedSuffix);
 		if (engine === 'mssql' || engine === 'mssqlNative')
 			return concatWithOperator('+', encodedPrefix, encodedArg, encodedSuffix);
@@ -5596,7 +5599,7 @@ function requireNewEncode$5 () {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
-					;
+					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
 			var encodeCore = getSessionSingleton(context, 'encodeDate') || encodeDate;
@@ -5708,39 +5711,44 @@ function requireNewEncode$4 () {
 	hasRequiredNewEncode$4 = 1;
 	var newPara = requireNewParameterized();
 	var purify = requirePurify$3();
+	var getSessionContext = requireGetSessionContext();
+	var getSessionSingleton = requireGetSessionSingleton();
 
 	function _new(column) {
-		var encode = function(_context, value) {
+		var encode = function(context, value) {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
 					return newPara('null');
 				return newPara('\'' + column.dbNull + '\'');
 			}
-			return newPara('?', [encodeDate(value)]);
+			var ctx = getSessionContext(context);
+			var encodeCore = ctx.encodeDateTz || ctx.encodeDate || encodeDate;
+			return newPara('?', [encodeCore(value)]);
 		};
 
-		encode.unsafe = function(_context, value) {
+		encode.unsafe = function(context, value) {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
 					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
-			return encodeDate(value);
+			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+			return encodeCore(value);
 		};
 
-		encode.direct = function(_context, value) {
-			return encodeDate(value);
+		encode.direct = function(context, value) {
+			var encodeCore = getSessionSingleton(context, 'encodeDateTz') || getSessionSingleton(context, 'encodeDate') || encodeDate;
+			return encodeCore(value);
 		};
 
 		return encode;
-
-
 	}
+
 	function encodeDate(date) {
 		if (date.toISOString)
-			return truncate(date.toISOString(date));
+			return truncate(date.toISOString());
 		return truncate(date);
 	}
 
@@ -5748,7 +5756,6 @@ function requireNewEncode$4 () {
 		return date;
 	}
 
-
 	newEncode$4 = _new;
 	return newEncode$4;
 }
@@ -5936,7 +5943,7 @@ function requireNewEncode$2 () {
 			value = purify(value);
 			if (value == null) {
 				if (column.dbNull === null)
-					;
+					return 'null';
 				return '\'' + column.dbNull + '\'';
 			}
 			var encodeCore = getSessionSingleton(context, 'encodeBigint') || encodeBigint;
@@ -6285,18 +6292,13 @@ function requireColumn () {
 			return c;
 		};
 
-		c.date = function() {
-			requireDate()(column);
-			return c;
-		};
-
 		c.dateWithTimeZone = function() {
 			requireDateWithTimeZone()(column);
 			return c;
 		};
 
-		c.numeric = function(optionalPrecision,optionalScale) {
-			requireNumeric()(column,optionalPrecision,optionalScale);
+		c.numeric = function() {
+			requireNumeric()(column);
 			return c;
 		};
 
@@ -7170,7 +7172,7 @@ function requireIsJsonUpdateSupported () {
 	if (hasRequiredIsJsonUpdateSupported) return isJsonUpdateSupported_1;
 	hasRequiredIsJsonUpdateSupported = 1;
 	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';
 	}
 
 	isJsonUpdateSupported_1 = isJsonUpdateSupported;
@@ -7269,7 +7271,7 @@ function requireNewUpdateCommandCore () {
 			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') {
@@ -7308,7 +7310,7 @@ function requireNewUpdateCommandCore () {
 			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') {
@@ -7369,6 +7371,11 @@ function requireNewUpdateCommandCore () {
 				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(?))';
@@ -7393,7 +7400,7 @@ function requireNewUpdateCommandCore () {
 				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));
 			}
@@ -7421,6 +7428,12 @@ function requireNewUpdateCommandCore () {
 				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);
@@ -7496,6 +7509,15 @@ function requireNewUpdateCommandCore () {
 				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);
@@ -8195,7 +8217,7 @@ function requireNewSingleCommandCore () {
 			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') {
@@ -8236,6 +8258,10 @@ function requireNewSingleCommandCore () {
 				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);
@@ -8868,6 +8894,10 @@ function requireDbRowToRow () {
 	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;
@@ -8884,13 +8914,15 @@ function requireDbRowToRow () {
 		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() {
@@ -8905,6 +8937,33 @@ function requireDbRowToRow () {
 		return row;
 	}
 
+	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);
+	}
+
 	dbRowToRow_1 = dbRowToRow;
 	return dbRowToRow_1;
 }
@@ -10246,10 +10305,9 @@ function requireWhere$1 () {
 	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 {
@@ -10265,11 +10323,11 @@ function requireWhere$1 () {
 		}
 		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;
 				}
@@ -10296,10 +10354,9 @@ function requireAggregate$1 () {
 	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 {
@@ -10314,11 +10371,11 @@ function requireAggregate$1 () {
 		}
 		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;
 				}
@@ -10979,7 +11036,7 @@ function requireNewManyCacheCore () {
 			}
 			var rows = newArray();
 			rows.push(childRow);
-			existing = cache.tryAdd(key, rows);
+			cache.tryAdd(key, rows);
 		}
 
 		function newArray() {
@@ -11705,16 +11762,18 @@ function requireGetManyDto$1 () {
 				outRow[column.alias] = column.decode(context, row[keys[j]]);
 			}
 
-			for (let j = 0; j < aggregateKeys.length; j++) {
-				const key = aggregateKeys[j];
-				const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
-				outRow[key] = parse(context, row[keys[j + columnsLength]]);
+			if (outRow) {
+				for (let j = 0; j < aggregateKeys.length; j++) {
+					const key = aggregateKeys[j];
+					const parse = span.aggregates[key].column?.decode || ((context, arg) => Number.parseFloat(arg));
+					outRow[key] = parse(context, row[keys[j + columnsLength]]);
+				}
 			}
 
 			outRows[i] = outRow;
 			if (updateParent)
 				updateParent(outRow, i);
-			if (shouldCreateMap) {
+			if (shouldCreateMap && outRow) {
 				fkIds[i] = getIds(outRow);
 				addToMap(rowsMap, fkIds[i], outRow);
 			}
@@ -12905,7 +12964,6 @@ function requirePatchTable () {
 				let result;
 				for (let i = 0; i < relation.columns.length; i++) {
 					let p = relation.columns[i].alias;
-					row[p];
 					result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
 				}
 				return result || {};
@@ -12918,8 +12976,7 @@ function requirePatchTable () {
 					let p = relation.columns[i].alias;
 					let childKey = relation.childTable._primaryColumns[i].alias;
 					if (path[1] === childKey) {
-						row[p];
-						result = await remove({ path: ['dummy', p], oldValue: (oldValue || {})[p], op, options: options }, table, row) || result;
+						result = await remove({ path: ['dummy', p], oldValue: oldValue[p], op, options: options }, table, row) || result;
 						break;
 					}
 				}
@@ -13509,6 +13566,11 @@ function requireCreateProviders () {
 				return createPool.bind(null, 'mysql');
 			}
 		});
+		Object.defineProperty(dbMap, 'mariadb', {
+			get:  function() {
+				return createPool.bind(null, 'mariadb');
+			}
+		});
 		Object.defineProperty(dbMap, 'sap', {
 			get:  function() {
 				return createPool.bind(null, 'sap');
@@ -13573,6 +13635,9 @@ function requireCreateProviders () {
 			get mysql() {
 				return createPool.bind(null, 'mysql');
 			},
+			get mariadb() {
+				return createPool.bind(null, 'mariadb');
+			},
 			get sap() {
 				return createPool.bind(null, 'sap');
 			},
@@ -13668,6 +13733,7 @@ function requireMap () {
 		context.mssql = connect.bind(null, 'mssql');
 		context.mssqlNative = connect.bind(null, 'mssqlNative');
 		context.mysql = connect.bind(null, 'mysql');
+		context.mariadb = connect.bind(null, 'mariadb');
 		context.sap = connect.bind(null, 'sap');
 		context.oracle = connect.bind(null, 'oracle');
 		context.sqlite = connect.bind(null, 'sqlite');
@@ -16915,7 +16981,7 @@ function requireNewPgPool () {
 					if (!pg) {
 						pg = await import('pg');
 						pg  = pg.default || pg;
-						let types = pg.types || pg.types;
+						let types = pg.types;
 						types.setTypeParser(1700, function(val) {
 							return parseFloat(val);
 						});