orange-orm 4.8.2 → 4.9.1

package/dist/index.browser.mjs

@@ -4132,8 +4132,10 @@ function requireNewShallowJoinSqlCore () {
 
 	function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
 		const quote = getSessionSingleton(context, 'quote');
-		leftAlias = quote(leftAlias);
-		rightAlias = quote(rightAlias);
+		const leftAliasRaw = leftAlias;
+		const rightAliasRaw = rightAlias;
+		leftAlias = quote(leftAliasRaw);
+		rightAlias = quote(rightAliasRaw);
 		var sql = '';
 		var delimiter = '';
 		for (var i = 0; i < leftColumns.length; i++) {
@@ -4147,7 +4149,7 @@ function requireNewShallowJoinSqlCore () {
 			sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
 		}
 
-		sql += newDiscriminatorSql(context, rightTable, rightAlias);
+		sql += newDiscriminatorSql(context, rightTable, rightAliasRaw);
 		var result = newParameterized(sql);
 		if (filter)
 			result = result.append(delimiter).append(filter);

package/dist/index.mjs

@@ -4133,8 +4133,10 @@ function requireNewShallowJoinSqlCore () {
 
 	function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
 		const quote = getSessionSingleton(context, 'quote');
-		leftAlias = quote(leftAlias);
-		rightAlias = quote(rightAlias);
+		const leftAliasRaw = leftAlias;
+		const rightAliasRaw = rightAlias;
+		leftAlias = quote(leftAliasRaw);
+		rightAlias = quote(rightAliasRaw);
 		var sql = '';
 		var delimiter = '';
 		for (var i = 0; i < leftColumns.length; i++) {
@@ -4148,7 +4150,7 @@ function requireNewShallowJoinSqlCore () {
 			sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
 		}
 
-		sql += newDiscriminatorSql(context, rightTable, rightAlias);
+		sql += newDiscriminatorSql(context, rightTable, rightAliasRaw);
 		var result = newParameterized(sql);
 		if (filter)
 			result = result.append(delimiter).append(filter);
@@ -18102,27 +18104,42 @@ var hasRequiredWrapQuery$4;
 function requireWrapQuery$4 () {
 	if (hasRequiredWrapQuery$4) return wrapQuery_1$4;
 	hasRequiredWrapQuery$4 = 1;
-	var log = requireLog();
+	const log = requireLog();
+	const connectionCache  = new WeakMap();
 
 	function wrapQuery(_context, connection) {
-		var runOriginalQuery = connection.all;
+		let statementCache = connectionCache.get(connection);
+		if (!statementCache) {
+			statementCache = new Map();
+			connectionCache.set(connection, statementCache);
+		}
+
 		return runQuery;
 
 		function runQuery(query, onCompleted) {
-			var params = query.parameters;
-			var sql = query.sql();
-			log.emitQuery({sql, parameters: params});
+			try {
+				var params = query.parameters;
+				var sql = query.sql();
+				log.emitQuery({ sql, parameters: params });
 
-			runOriginalQuery.call(connection, sql, params, onInnerCompleted);
+				let statement = statementCache.get(sql);
+				if (!statement) {
+					statement = connection.prepare(sql);
+					statementCache.set(sql, statement);
+				}
 
-			function onInnerCompleted(err, rows) {
-				if (err)
-					onCompleted(err);
-				else
+				if (statement.reader) {
+					const rows = statement.all.apply(statement, params);
 					onCompleted(null, rows);
+				} else {
+					statement.run.apply(statement, params);
+					onCompleted(null, []);
+				}
+			}
+			catch (e) {
+				onCompleted(e);
 			}
 		}
-
 	}
 
 	wrapQuery_1$4 = wrapQuery;
@@ -18136,9 +18153,14 @@ function requireWrapCommand$4 () {
 	if (hasRequiredWrapCommand$4) return wrapCommand_1$4;
 	hasRequiredWrapCommand$4 = 1;
 	var log = requireLog();
+	var connectionCache = new WeakMap();
 
 	function wrapCommand(_context, connection) {
-		var runOriginalQuery = connection.run;
+		var statementCache = connectionCache.get(connection);
+		if (!statementCache) {
+			statementCache = new Map();
+			connectionCache.set(connection, statementCache);
+		}
 		return runQuery;
 
 		function runQuery(query, onCompleted) {
@@ -18146,14 +18168,23 @@ function requireWrapCommand$4 () {
 			var sql = query.sql();
 			log.emitQuery({ sql, parameters: params });
 
-			runOriginalQuery.call(connection, sql, params, function onInnerCompleted(err) {
-				if (err) {
-					onCompleted(err);
-				} else {
-					var affectedRows = typeof this.changes === 'number' ? this.changes : 0;
-					onCompleted(null, { rowsAffected: affectedRows });
+			try {
+				var statement = statementCache.get(sql);
+				if (!statement) {
+					statement = connection.prepare(sql);
+					statementCache.set(sql, statement);
 				}
-			});
+				var info = statement.run.apply(statement, params);
+				var affected = info && typeof info.changes === 'number' ? info.changes : 0;
+				var insertId = info && typeof info.lastInsertRowid !== 'undefined' ? info.lastInsertRowid : undefined;
+				if (typeof insertId !== 'undefined')
+					onCompleted(null, { rowsAffected: affected, lastInsertRowid: insertId });
+				else
+					onCompleted(null, { rowsAffected: affected });
+			}
+			catch (e) {
+				onCompleted(e);
+			}
 		}
 	}
 
@@ -18320,20 +18351,20 @@ function requireNewGenericPool$4 () {
 			create: async function(cb) {
 				try {
 					if (!sqlite)
-						sqlite = await import('sqlite3');
+						sqlite = await import('better-sqlite3');
 					sqlite = sqlite.default || sqlite;
 				}
 				catch (err) {
 					return cb(err, null);
 				}
-				var client = new sqlite.Database(connectionString, onConnected);
-
-				function onConnected(err) {
-					if(err)
-						return cb(err, null);
+				try {
+					var client = new sqlite(connectionString);
 					client.poolCount = 0;
 					return cb(null, client);
 				}
+				catch (err) {
+					return cb(err, null);
+				}
 			},
 
 			destroy: function(client) {

package/docs/changelog.md

@@ -1,4 +1,9 @@
 ## Changelog
+__4.9.1__  
+Fix: Avoid double-quoting aliases in discriminator join SQL [#144](https://github.com/alfateam/orange-orm/issues/144)    
+__4.9.0__  
+Node.js 22.5+: Continues using built-in `node:sqlite` (no action needed)  
+Node.js 18-22.4: Now requires `better-sqlite3` instead of `sqlite3`  
 __4.8.2__  
 Slight performance gain on updates and removed accidental console.dir  
 __4.8.1__  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "4.8.2",
+    "version": "4.9.1",
     "publishConfig": {
         "access": "public"
     },
@@ -93,7 +93,7 @@
         "oracledb": "^6.3.0",
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
-        "sqlite3": "^5.0.2",
+        "better-sqlite3": "^11.8.1",
         "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
     },
     "peerDependenciesMeta": {
@@ -106,7 +106,7 @@
         "mysql2": {
             "optional": true
         },
-        "sqlite3": {
+        "better-sqlite3": {
             "optional": true
         },
         "pg-native": {
@@ -144,7 +144,7 @@
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
         "rollup": "^2.52.7",
-        "sqlite3": "^5.0.2",
+        "better-sqlite3": "^11.8.1",
         "tedious": "^19.0.0",
         "typescript": "^5.4.5",
         "vitest": "^3.2.4"

package/src/sqlite3/pool/newGenericPool.js

@@ -15,20 +15,20 @@ function newGenericPool(connectionString, poolOptions) {
 		create: async function(cb) {
 			try {
 				if (!sqlite)
-					sqlite = await import('sqlite3');
+					sqlite = await import('better-sqlite3');
 				sqlite = sqlite.default || sqlite;
 			}
 			catch (err) {
 				return cb(err, null);
 			}
-			var client = new sqlite.Database(connectionString, onConnected);
-
-			function onConnected(err) {
-				if(err)
-					return cb(err, null);
+			try {
+				var client = new sqlite(connectionString);
 				client.poolCount = 0;
 				return cb(null, client);
 			}
+			catch (err) {
+				return cb(err, null);
+			}
 		},
 
 		destroy: function(client) {
@@ -53,4 +53,4 @@ function newGenericPool(connectionString, poolOptions) {
 	return pool;
 }
 
-module.exports = newGenericPool;
+module.exports = newGenericPool;

package/src/sqlite3/wrapCommand.js

@@ -1,7 +1,12 @@
 var log = require('../table/log');
+var connectionCache = new WeakMap();
 
 function wrapCommand(_context, connection) {
-	var runOriginalQuery = connection.run;
+	var statementCache = connectionCache.get(connection);
+	if (!statementCache) {
+		statementCache = new Map();
+		connectionCache.set(connection, statementCache);
+	}
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
@@ -9,14 +14,23 @@ function wrapCommand(_context, connection) {
 		var sql = query.sql();
 		log.emitQuery({ sql, parameters: params });
 
-		runOriginalQuery.call(connection, sql, params, function onInnerCompleted(err) {
-			if (err) {
-				onCompleted(err);
-			} else {
-				var affectedRows = typeof this.changes === 'number' ? this.changes : 0;
-				onCompleted(null, { rowsAffected: affectedRows });
+		try {
+			var statement = statementCache.get(sql);
+			if (!statement) {
+				statement = connection.prepare(sql);
+				statementCache.set(sql, statement);
 			}
-		});
+			var info = statement.run.apply(statement, params);
+			var affected = info && typeof info.changes === 'number' ? info.changes : 0;
+			var insertId = info && typeof info.lastInsertRowid !== 'undefined' ? info.lastInsertRowid : undefined;
+			if (typeof insertId !== 'undefined')
+				onCompleted(null, { rowsAffected: affected, lastInsertRowid: insertId });
+			else
+				onCompleted(null, { rowsAffected: affected });
+		}
+		catch (e) {
+			onCompleted(e);
+		}
 	}
 }
 

package/src/sqlite3/wrapQuery.js

@@ -1,24 +1,39 @@
-var log = require('../table/log');
+const log = require('../table/log');
+const connectionCache  = new WeakMap();
 
 function wrapQuery(_context, connection) {
-	var runOriginalQuery = connection.all;
+	let statementCache = connectionCache.get(connection);
+	if (!statementCache) {
+		statementCache = new Map();
+		connectionCache.set(connection, statementCache);
+	}
+
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
-		var params = query.parameters;
-		var sql = query.sql();
-		log.emitQuery({sql, parameters: params});
+		try {
+			var params = query.parameters;
+			var sql = query.sql();
+			log.emitQuery({ sql, parameters: params });
 
-		runOriginalQuery.call(connection, sql, params, onInnerCompleted);
+			let statement = statementCache.get(sql);
+			if (!statement) {
+				statement = connection.prepare(sql);
+				statementCache.set(sql, statement);
+			}
 
-		function onInnerCompleted(err, rows) {
-			if (err)
-				onCompleted(err);
-			else
+			if (statement.reader) {
+				const rows = statement.all.apply(statement, params);
 				onCompleted(null, rows);
+			} else {
+				statement.run.apply(statement, params);
+				onCompleted(null, []);
+			}
+		}
+		catch (e) {
+			onCompleted(e);
 		}
 	}
-
 }
 
-module.exports = wrapQuery;
+module.exports = wrapQuery;

package/src/table/query/singleQuery/joinSql/newShallowJoinSqlCore.js

@@ -4,8 +4,10 @@ const getSessionSingleton = require('../../../getSessionSingleton');
 
 function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAlias, filter) {
 	const quote = getSessionSingleton(context, 'quote');
-	leftAlias = quote(leftAlias);
-	rightAlias = quote(rightAlias);
+	const leftAliasRaw = leftAlias;
+	const rightAliasRaw = rightAlias;
+	leftAlias = quote(leftAliasRaw);
+	rightAlias = quote(rightAliasRaw);
 	var sql = '';
 	var delimiter = '';
 	for (var i = 0; i < leftColumns.length; i++) {
@@ -19,11 +21,11 @@ function _new(context, rightTable, leftColumns, rightColumns, leftAlias, rightAl
 		sql += delimiter + leftAlias + '.' + quote(leftColumn._dbName) + '=' + rightAlias + '.' + quote(rightColumn._dbName);
 	}
 
-	sql += newDiscriminatorSql(context, rightTable, rightAlias);
+	sql += newDiscriminatorSql(context, rightTable, rightAliasRaw);
 	var result = newParameterized(sql);
 	if (filter)
 		result = result.append(delimiter).append(filter);
 	return result;
 }
 
-module.exports = _new;
+module.exports = _new;