orange-orm 4.5.1-beta.1 → 4.5.1-beta.3

package/dist/index.mjs

@@ -15101,9 +15101,6 @@ function requireEncodeBinary () {
 	if (hasRequiredEncodeBinary) return encodeBinary_1;
 	hasRequiredEncodeBinary = 1;
 	function encodeBinary(base64) {
-		// return Buffer.from(base64, 'base64');
-
-
 		// Decode base64 to a binary string
 		const binaryString = atob(base64);
 
@@ -15686,7 +15683,7 @@ function requireWrapQuery$5 () {
 				var sql = query.sql();
 				log.emitQuery({ sql, parameters: params });
 
-				var statement = connection.prepare(sql);
+				var statement = connection.query(sql);
 				const rows = statement.all.apply(statement, params);
 				onCompleted(null, rows);
 			}
@@ -15709,6 +15706,8 @@ function requireNewTransaction$6 () {
 	hasRequiredNewTransaction$6 = 1;
 	const wrapQuery = requireWrapQuery$5();
 	const encodeBoolean = requireEncodeBoolean$4();
+	const encodeBinary = requireEncodeBinary();
+	const decodeBinary = requireDecodeBinary();
 	const deleteFromSql = requireDeleteFromSql$4();
 	const selectForUpdateSql = requireSelectForUpdateSql$4();
 	const lastInsertedSql = requireLastInsertedSql$3();
@@ -15725,6 +15724,8 @@ function requireNewTransaction$6 () {
 		}
 		rdb.engine = 'sqlite';
 		rdb.encodeBoolean = encodeBoolean;
+		rdb.encodeBinary = encodeBinary;
+		rdb.decodeBinary = decodeBinary;
 		rdb.decodeJSON = decodeJSON;
 		rdb.encodeJSON = JSON.stringify;
 		rdb.deleteFromSql = deleteFromSql;
@@ -15804,7 +15805,7 @@ function requireNewGenericPool$5 () {
 	var defaults = requirePoolDefaults();
 
 	var genericPool = requireGenericPool();
-	var sqlite;
+	var Database;
 
 	function newGenericPool(connectionString, poolOptions) {
 		poolOptions = poolOptions || {};
@@ -15816,14 +15817,14 @@ function requireNewGenericPool$5 () {
 			create: async function(cb) {
 				try {
 					try {
-						if (!sqlite)
-							sqlite = await import('bun:sqlite');
+						if (!Database)
+							({ Database } = await import('bun:Database'));
 					}
 					catch (err) {
 						return cb(err, null);
 					}
 
-					var client = new sqlite.DatabaseSync(connectionString);
+					var client = new Database(connectionString);
 					client.poolCount = 0;
 					cb(null, client);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.5.1-beta.1",
+  "version": "4.5.1-beta.3",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",
@@ -53,6 +53,7 @@
     "tscheck": "tsc ./src/index.d.ts --module commonjs --target es2022 --noEmit true --strict true --esModuleInterop true",
     "concat-server": "node ./src/merge-server.js",
     "concat-browser": "node ./src/merge-browser.js",
+    "build": "npm run build-server && npm run build-browser",
     "build-server": "rollup -c ./src/rollup.config.server.js && npm run concat-server",
     "build-browser": "rollup -c ./src/rollup.config.browser.js && npm run concat-browser",
     "lint": "eslint ./",

package/src/bunSqlite/newTransaction.js

@@ -1,5 +1,7 @@
 const wrapQuery = require('./wrapQuery');
 const encodeBoolean = require('../sqlite/encodeBoolean');
+const encodeBinary = require('../nodeSqlite/encodeBinary');
+const decodeBinary = require('../nodeSqlite/decodeBinary');
 const deleteFromSql = require('../sqlite/deleteFromSql');
 const selectForUpdateSql = require('../sqlite/selectForUpdateSql');
 const lastInsertedSql = require('../sqlite/lastInsertedSql');
@@ -16,6 +18,8 @@ function newResolveTransaction(domain, pool, { readonly = false } = {})  {
 	}
 	rdb.engine = 'sqlite';
 	rdb.encodeBoolean = encodeBoolean;
+	rdb.encodeBinary = encodeBinary;
+	rdb.decodeBinary = decodeBinary;
 	rdb.decodeJSON = decodeJSON;
 	rdb.encodeJSON = JSON.stringify;
 	rdb.deleteFromSql = deleteFromSql;

package/src/bunSqlite/pool/newGenericPool.js

@@ -2,7 +2,7 @@
 var defaults = require('../../poolDefaults');
 
 var genericPool = require('../../generic-pool');
-var sqlite;
+var Database;
 
 function newGenericPool(connectionString, poolOptions) {
 	poolOptions = poolOptions || {};
@@ -14,14 +14,14 @@ function newGenericPool(connectionString, poolOptions) {
 		create: async function(cb) {
 			try {
 				try {
-					if (!sqlite)
-						sqlite = await import('bun:sqlite');
+					if (!Database)
+						({ Database } = await import('bun:Database'));
 				}
 				catch (err) {
 					return cb(err, null);
 				}
 
-				var client = new sqlite.DatabaseSync(connectionString);
+				var client = new Database(connectionString);
 				client.poolCount = 0;
 				cb(null, client);
 			}

package/src/bunSqlite/wrapQuery.js

@@ -9,7 +9,7 @@ function wrapQuery(connection) {
 			var sql = query.sql();
 			log.emitQuery({ sql, parameters: params });
 
-			var statement = connection.prepare(sql);
+			var statement = connection.query(sql);
 			const rows = statement.all.apply(statement, params);
 			onCompleted(null, rows);
 		}

package/src/nodeSqlite/encodeBinary.js

@@ -1,7 +1,4 @@
 function encodeBinary(base64) {
-	// return Buffer.from(base64, 'base64');
-
-
 	// Decode base64 to a binary string
 	const binaryString = atob(base64);