orange-orm 4.7.0-beta.3 → 4.7.1

package/README.md

@@ -1591,12 +1591,10 @@ const db = map.sqlite('demo.db');
 getRows();
 
 async function getRows() {
-  const filter = db.order.lines.any(x => x.product.contains('guitar'));
-  //equivalent syntax:
-  // const filter = db.order.lines.product.contains('guitar');
-
   const rows = await db.order.getAll({
     where: y => y.lines.any(x => x.product.contains('guitar'))
+    //equivalent syntax:
+    //where: x => x.lines.product.contains('guitar')
   });  
 }
 ```

package/dist/index.browser.mjs

@@ -4374,7 +4374,7 @@ function requireEndsWithCore () {
 	var nullOperator = ' is ';
 
 	function endsWithCore(context, operator, column,arg,alias) {
-		alias = quote(alias);
+		alias = quote(context, alias);
 		operator = ' ' + operator + ' ';
 		var encoded = column.encode(context, arg);
 		if (encoded.sql() == 'null')
@@ -6086,7 +6086,7 @@ function requireNegotiateExclusive () {
 	function negotiateExclusive(context, table, alias, _exclusive) {
 		if (table._exclusive || _exclusive) {
 			var encode =  getSessionSingleton(context, 'selectForUpdateSql');
-			return encode(alias);
+			return encode(context, alias);
 		}
 		return '';
 	}
@@ -11081,8 +11081,8 @@ function requireGetManyDto$1 () {
 			return decode(context, strategy[name], leg.span, rawRows, keys, updateParent);
 
 			function updateParent(subRow, i) {
-				resultRows[i][name] = subRow;
-
+				if (resultRows[i])
+					resultRows[i][name] = subRow;
 			}
 		};
 
@@ -12631,8 +12631,8 @@ function requireSelectForUpdateSql$1 () {
 	hasRequiredSelectForUpdateSql$1 = 1;
 	const quote = requireQuote$2();
 
-	selectForUpdateSql$1 = function(alias) {
-		return ' FOR UPDATE OF ' + quote(alias);
+	selectForUpdateSql$1 = function(context, alias) {
+		return ' FOR UPDATE OF ' + quote(context, alias);
 	};
 	return selectForUpdateSql$1;
 }

package/dist/index.mjs

@@ -4376,7 +4376,7 @@ function requireEndsWithCore () {
 	var nullOperator = ' is ';
 
 	function endsWithCore(context, operator, column,arg,alias) {
-		alias = quote(alias);
+		alias = quote(context, alias);
 		operator = ' ' + operator + ' ';
 		var encoded = column.encode(context, arg);
 		if (encoded.sql() == 'null')
@@ -6088,7 +6088,7 @@ function requireNegotiateExclusive () {
 	function negotiateExclusive(context, table, alias, _exclusive) {
 		if (table._exclusive || _exclusive) {
 			var encode =  getSessionSingleton(context, 'selectForUpdateSql');
-			return encode(alias);
+			return encode(context, alias);
 		}
 		return '';
 	}
@@ -11083,8 +11083,8 @@ function requireGetManyDto$2 () {
 			return decode(context, strategy[name], leg.span, rawRows, keys, updateParent);
 
 			function updateParent(subRow, i) {
-				resultRows[i][name] = subRow;
-
+				if (resultRows[i])
+					resultRows[i][name] = subRow;
 			}
 		};
 
@@ -15933,8 +15933,8 @@ function requireSelectForUpdateSql$3 () {
 	hasRequiredSelectForUpdateSql$3 = 1;
 	const quote = requireQuote$6();
 
-	selectForUpdateSql$3 = function(alias) {
-		return ' FOR UPDATE OF ' + quote(alias);
+	selectForUpdateSql$3 = function(context, alias) {
+		return ' FOR UPDATE OF ' + quote(context, alias);
 	};
 	return selectForUpdateSql$3;
 }
@@ -16564,7 +16564,6 @@ function requireNewGenericPool$5 () {
 
 	var genericPool = requireGenericPool();
 	var Database;
-
 	function newGenericPool(connectionString, poolOptions) {
 		poolOptions = poolOptions || {};
 		var pool = genericPool.Pool({
@@ -16577,7 +16576,8 @@ function requireNewGenericPool$5 () {
 				try {
 					try {
 						if (!Database)
-							({ Database } = await import('bun:Database'));
+							({ Database } = await import('bun:sqlite'));
+
 					}
 					catch (err) {
 						return cb(err, null);

package/docs/changelog.md

@@ -1,4 +1,14 @@
 ## Changelog
+__4.7.1__  
+Bugfix:  Error when using bun and sqlite: Cannot find package 'Database'. See [#127](https://github.com/alfateam/issues/127)  
+__4.7.0__  
+Support for [PGLite](https://pglite.dev/). See [#124](https://github.com/alfateam/orange-orm/issues/124)  
+__4.6.3__  
+Bugfix:  Chained Reference relation throws if first one is null. See [#126](https://github.com/alfateam/orange-orm/issues/126)  
+__4.6.2__  
+Bugfix:  crashed when combining endsWith filter with other filter: e.g. `endsWith('foo').or(...)`  
+__4.6.1__  
+Bugfix:  No intellisense when running in browser mode .  See [#125](https://github.com/alfateam/orange-orm/issues/125)  
 __4.6.0__  
 Support for Deno and Bun.  
 Using builtin sqlite for Node22++.    

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.7.0-beta.3",
+  "version": "4.7.1",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",

package/src/bunSqlite/pool/newGenericPool.js

@@ -3,7 +3,6 @@ var defaults = require('../../poolDefaults');
 
 var genericPool = require('../../generic-pool');
 var Database;
-
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
 	var pool = genericPool.Pool({
@@ -16,7 +15,8 @@ function newGenericPool(connectionString, poolOptions) {
 			try {
 				try {
 					if (!Database)
-						({ Database } = await import('bun:Database'));
+						({ Database } = await import('bun:sqlite'));
+
 				}
 				catch (err) {
 					return cb(err, null);

package/src/getManyDto.js

@@ -338,8 +338,8 @@ async function decodeRelations2(context, strategy, span, rawRows, resultRows, ke
 		return decode(context, strategy[name], leg.span, rawRows, keys, updateParent);
 
 		function updateParent(subRow, i) {
-			resultRows[i][name] = subRow;
-
+			if (resultRows[i])
+				resultRows[i][name] = subRow;
 		}
 	};
 

package/src/sqlite/selectForUpdateSql.js

@@ -1,5 +1,5 @@
 const quote = require('../table/quote');
 
-module.exports = function(alias) {
-	return ' FOR UPDATE OF ' + quote(alias);
+module.exports = function(context, alias) {
+	return ' FOR UPDATE OF ' + quote(context, alias);
 };

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

@@ -3,7 +3,7 @@ var newBoolean = require('../newBoolean');
 var nullOperator = ' is ';
 
 function endsWithCore(context, operator, column,arg,alias) {
-	alias = quote(alias);
+	alias = quote(context, alias);
 	operator = ' ' + operator + ' ';
 	var encoded = column.encode(context, arg);
 	if (encoded.sql() == 'null')

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

@@ -3,7 +3,7 @@ var getSessionSingleton = require('../../getSessionSingleton');
 function negotiateExclusive(context, table, alias, _exclusive) {
 	if (table._exclusive || _exclusive) {
 		var encode =  getSessionSingleton(context, 'selectForUpdateSql');
-		return encode(alias);
+		return encode(context, alias);
 	}
 	return '';
 }