orange-orm 5.2.4 → 5.3.0

package/src/client/index.js

@@ -65,6 +65,7 @@ function rdbClient(options = {}) {
 	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;

package/src/client/map.js

@@ -46,6 +46,7 @@ function map(index, context, providers, fn) {
 	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');

package/src/index.d.ts

@@ -28,6 +28,7 @@ declare namespace r {
     function mssql(connectionString: string, options?: PoolOptions): Pool;
     function mssqlNative(connectionString: string, options?: PoolOptions): Pool;
     function mysql(connectionString: string, options?: PoolOptions): Pool;
+    function mariadb(connectionString: string, options?: PoolOptions): Pool;
     function oracle(config: PoolAttributes, options?: PoolOptions): Pool;
     function on(type: 'query', cb: (e: QueryEvent) => void): void;
     function off(type: 'query', cb: (e: QueryEvent) => void): void;

package/src/index.js

@@ -6,6 +6,7 @@ const map = require('./client/map');
 const runtimes = require('./runtimes');
 
 let _mySql;
+let _mariadb;
 let _pg;
 let _pglite;
 let _sqlite;
@@ -16,7 +17,9 @@ let _oracle;
 let _d1;
 
 var connectViaPool = function(connectionString) {
-	if (connectionString.indexOf && connectionString.indexOf('mysql') === 0)
+	if (connectionString.indexOf && connectionString.indexOf('mariadb') === 0)
+		return connectViaPool.mariadb.apply(null, arguments);
+	else if (connectionString.indexOf && connectionString.indexOf('mysql') === 0)
 		return connectViaPool.mySql.apply(null, arguments);
 	else if (connectionString.indexOf && connectionString.indexOf('postgres') === 0)
 		connectViaPool.pg.apply(null, arguments);
@@ -57,6 +60,13 @@ Object.defineProperty(connectViaPool, 'mySql', {
 		return _mySql;
 	}
 });
+Object.defineProperty(connectViaPool, 'mariadb', {
+	get: function() {
+		if (!_mariadb)
+			_mariadb = require('./mariaDb/newDatabase');
+		return _mariadb;
+	}
+});
 Object.defineProperty(connectViaPool, 'pglite', {
 	get: function() {
 		if (!_pglite)

package/src/map.d.ts

@@ -41,6 +41,7 @@ type DbConnectable<T> = {
 	mssql(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
 	mssqlNative(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
 	mysql(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	mariadb(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
 	oracle(config: PoolAttributes, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
 };
 
@@ -71,6 +72,8 @@ interface Connectors {
 	sap(connectionString: string, options?: PoolOptions): Pool;
 	mssql(connectionConfig: ConnectionConfiguration, options?: PoolOptions): Pool;
 	mssql(connectionString: string, options?: PoolOptions): Pool;
+	mysql(connectionString: string, options?: PoolOptions): Pool;
+	mariadb(connectionString: string, options?: PoolOptions): Pool;
 	oracle(config: PoolAttributes, options?: PoolOptions): Pool;
 }
 

package/src/map2.d.ts

@@ -881,6 +881,8 @@ interface Connectors {
   sap(connectionString: string, options?: PoolOptions): Pool;
   mssql(connectionConfig: ConnectionConfiguration, options?: PoolOptions): Pool;
   mssql(connectionString: string, options?: PoolOptions): Pool;
+  mysql(connectionString: string, options?: PoolOptions): Pool;
+  mariadb(connectionString: string, options?: PoolOptions): Pool;
   oracle(config: PoolAttributes, options?: PoolOptions): Pool;
 }
 
@@ -895,6 +897,7 @@ type DbConnectable<M extends Record<string, TableDefinition<M>>> = {
   mssql(connectionString: string, options?: PoolOptions): DBClient<M>;
   mssqlNative(connectionString: string, options?: PoolOptions): DBClient<M>;
   mysql(connectionString: string, options?: PoolOptions): DBClient<M>;
+  mariadb(connectionString: string, options?: PoolOptions): DBClient<M>;
   oracle(config: PoolAttributes, options?: PoolOptions): DBClient<M>;
 };
 

package/src/mariaDb/newDatabase.js

@@ -0,0 +1,101 @@
+let createDomain = require('../createDomain');
+let newTransaction = require('./newTransaction');
+let _begin = require('../table/begin');
+let commit = require('../table/commit');
+let rollback = require('../table/rollback');
+let newPool = require('./newPool');
+let express = require('../hostExpress');
+let hono = require('../hostHono');
+let hostLocal = require('../hostLocal');
+let doQuery = require('../query');
+let releaseDbClient = require('../table/releaseDbClient');
+
+function newDatabase(connectionString, poolOptions) {
+	if (!connectionString)
+		throw new Error('Connection string cannot be empty');
+	poolOptions = poolOptions || { min: 1 };
+	var pool = newPool(connectionString, poolOptions);
+
+	let c = { poolFactory: pool, hostLocal, express, hono };
+
+	c.transaction = function(options, fn) {
+		if ((arguments.length === 1) && (typeof options === 'function')) {
+			fn = options;
+			options = undefined;
+		}
+		let domain = createDomain();
+
+		if (!fn)
+			throw new Error('transaction requires a function');
+		return domain.run(runInTransaction);
+
+		async function runInTransaction() {
+			let result;
+			let transaction = newTransaction(domain, pool, options);
+			await new Promise(transaction)
+				.then(begin)
+				.then(() => fn(domain))
+				.then((res) => result = res)
+				.then(() => commit(domain))
+				.then(null, (e) => rollback(domain, e));
+			return result;
+		}
+
+		function begin() {
+			return _begin(domain, options);
+		}
+	};
+
+	c.createTransaction = function(options) {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool);
+		let p = domain.run(() => new Promise(transaction).then(begin));
+
+		function run(fn) {
+			return p.then(() => fn(domain));
+		}
+		run.rollback = rollback.bind(null, domain);
+		run.commit = commit.bind(null, domain);
+		return run;
+
+		function begin() {
+			return _begin(domain, options);
+		}
+	};
+
+	c.query = function(query) {
+		let domain = createDomain();
+		let transaction = newTransaction(domain, pool);
+		let p = domain.run(() => new Promise(transaction)
+			.then(() => doQuery(domain, query).then(onResult, onError)));
+		return p;
+
+		function onResult(result) {
+			releaseDbClient(domain);
+			return result;
+		}
+
+		function onError(e) {
+			releaseDbClient(domain);
+			throw e;
+		}
+	};
+
+	c.rollback = rollback;
+	c.commit = commit;
+
+	c.end = function() {
+		if (poolOptions)
+			return pool.end();
+		else
+			return Promise.resolve();
+	};
+
+	c.accept = function(caller) {
+		caller.visitMySql();
+	};
+
+	return c;
+}
+
+module.exports = newDatabase;

package/src/mariaDb/newPool.js

@@ -0,0 +1,13 @@
+const mySqlNewPool = require('../mySql/newPool');
+
+function normalizeConnectionString(connectionString) {
+	if (typeof connectionString === 'string' && connectionString.indexOf('mariadb://') === 0)
+		return 'mysql://' + connectionString.slice('mariadb://'.length);
+	return connectionString;
+}
+
+function newPool(connectionString, poolOptions) {
+	return mySqlNewPool(normalizeConnectionString(connectionString), poolOptions);
+}
+
+module.exports = newPool;

package/src/mariaDb/newTransaction.js

@@ -0,0 +1,126 @@
+const wrapQuery = require('../mySql/wrapQuery');
+const wrapCommand = require('../mySql/wrapCommand');
+const encodeBoolean = require('../mySql/encodeBoolean');
+const deleteFromSql = require('../mySql/deleteFromSql');
+const selectForUpdateSql = require('../mySql/selectForUpdateSql');
+const lastInsertedSql = require('../mySql/lastInsertedSql');
+const limitAndOffset = require('../mySql/limitAndOffset');
+const formatBigintOut = require('../mySql/formatBigintOut');
+const insertSql = require('../mySql/insertSql');
+const insert = require('../mySql/insert');
+const quote = require('../mySql/quote');
+
+function newResolveTransaction(domain, pool, { readonly = false } = {}) {
+	var rdb = { poolFactory: pool };
+	if (!pool.connect) {
+		pool = pool();
+		rdb.pool = pool;
+	}
+	rdb.engine = 'mariadb';
+	rdb.encodeBoolean = encodeBoolean;
+	rdb.decodeJSON = decodeJSON;
+	rdb.encodeDate = encodeDate;
+	rdb.encodeDateTz = encodeDateTz;
+	rdb.encodeJSON = JSON.stringify;
+	rdb.deleteFromSql = deleteFromSql;
+	rdb.selectForUpdateSql = selectForUpdateSql;
+	rdb.lastInsertedIsSeparate = true;
+	rdb.lastInsertedSql = lastInsertedSql;
+	rdb.formatBigintOut = formatBigintOut;
+	rdb.insertSql = insertSql;
+	rdb.insert = insert;
+	rdb.multipleStatements = false;
+	rdb.limitAndOffset = limitAndOffset;
+	rdb.accept = function(caller) {
+		caller.visitMySql();
+	};
+	rdb.aggregateCount = 0;
+	rdb.quote = quote;
+	rdb.cache = {};
+	rdb.changes = [];
+
+	if (readonly) {
+		rdb.dbClient = {
+			executeQuery: function(query, callback) {
+				pool.connect((err, client, done) => {
+					if (err) {
+						return callback(err);
+					}
+					try {
+						wrapQuery(domain, client)(query, (err, res) => {
+							done();
+							callback(err, res);
+						});
+					} catch (e) {
+						done();
+						callback(e);
+					}
+				});
+			},
+			executeCommand: function(query, callback) {
+				pool.connect((err, client, done) => {
+					if (err) {
+						return callback(err);
+					}
+					try {
+						wrapCommand(domain, client)(query, (err, res) => {
+							done();
+							callback(err, res);
+						});
+					} catch (e) {
+						done();
+						callback(e);
+					}
+				});
+			}
+		};
+		domain.rdb = rdb;
+		return (onSuccess) => onSuccess();
+	}
+
+	return function(onSuccess, onError) {
+		pool.connect(onConnected);
+
+		function onConnected(err, client, done) {
+			try {
+				if (err) {
+					onError(err);
+					return;
+				}
+				client.executeQuery = wrapQuery(domain, client);
+				client.executeCommand = wrapCommand(domain, client);
+				rdb.dbClient = client;
+				rdb.dbClientDone = done;
+				domain.rdb = rdb;
+				onSuccess();
+			} catch (e) {
+				onError(e);
+			}
+		}
+	};
+}
+
+function decodeJSON(value) {
+	return JSON.parse(value);
+}
+
+function encodeDate(date) {
+	date = date.toISOString ? removeTimezone(date.toISOString()) : removeTimezone(date);
+	return date;
+}
+
+function removeTimezone(isoString) {
+	let dateTimePattern = /[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]{3})?/;
+	let match = isoString.match(dateTimePattern);
+	return match ? match[0] : isoString;
+}
+
+function encodeDateTz(date) {
+	if (date && date.toISOString)
+		return removeTimezone(date.toISOString());
+	if (typeof date === 'string' && /(Z|[+-][0-9]{2}:[0-9]{2})$/.test(date))
+		return removeTimezone(new Date(date).toISOString());
+	return date;
+}
+
+module.exports = newResolveTransaction;

package/src/mySql/newTransaction.js

@@ -18,6 +18,9 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	}
 	rdb.engine = 'mysql';
 	rdb.encodeBoolean = encodeBoolean;
+	rdb.decodeJSON = decodeJSON;
+	rdb.encodeDate = encodeDate;
+	rdb.encodeDateTz = encodeDateTz;
 	rdb.encodeJSON = JSON.stringify;
 	rdb.deleteFromSql = deleteFromSql;
 	rdb.selectForUpdateSql = selectForUpdateSql;
@@ -97,4 +100,27 @@ function newResolveTransaction(domain, pool, { readonly = false } = {}) {
 	};
 }
 
-module.exports = newResolveTransaction;
+function decodeJSON(value) {
+	return JSON.parse(value);
+}
+
+function encodeDate(date) {
+	date = date.toISOString ? removeTimezone(date.toISOString()) : removeTimezone(date);
+	return date;
+}
+
+function removeTimezone(isoString) {
+	let dateTimePattern = /[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(.[0-9]{3})?/;
+	let match = isoString.match(dateTimePattern);
+	return match ? match[0] : isoString;
+}
+
+function encodeDateTz(date) {
+	if (date && date.toISOString)
+		return removeTimezone(date.toISOString());
+	if (typeof date === 'string' && /(Z|[+-][0-9]{2}:[0-9]{2})$/.test(date))
+		return removeTimezone(new Date(date).toISOString());
+	return date;
+}
+
+module.exports = newResolveTransaction;

package/src/table/column/dateWithTimeZone/newEncode.js

@@ -1,38 +1,43 @@
 var newPara = require('../../query/newParameterized');
 var purify = require('../date/purify');
+var getSessionContext = require('../../getSessionContext');
+var getSessionSingleton = require('../../getSessionSingleton');
 
 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, '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, '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);
 }
 
@@ -40,5 +45,4 @@ function truncate(date) {
 	return date;
 }
 
-
 module.exports = _new;

package/src/table/column/string/newLikeColumnArg.js

@@ -6,7 +6,7 @@ function newLikeColumnArg(context, column, encodedArg, prefix, suffix) {
 	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);

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/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;