orange-orm 4.5.1-beta.3 → 4.5.1

package/src/bunPg/newDatabase.js

@@ -1,137 +0,0 @@
-let createDomain = require('../createDomain');
-let newTransaction = require('../pg/newTransaction');
-let _begin = require('../table/begin');
-let commit = require('../table/commit');
-let rollback = require('../table/rollback');
-let newPool = require('./newPool');
-let lock = require('../lock');
-let executeSchema = require('../pg/schema');
-let express = require('../hostExpress');
-let hostLocal = require('../hostLocal');
-let doQuery = require('../query');
-let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
-
-function newDatabase(connectionString, poolOptions) {
-	if (!connectionString)
-		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null, connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
-
-	let c = { poolFactory: pool, hostLocal, express };
-
-	c.transaction = function(options, fn) {
-		if ((arguments.length === 1) && (typeof options === 'function')) {
-			fn = options;
-			options = undefined;
-		}
-		let domain = createDomain();
-
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
-
-		async function runInTransaction() {
-			let result;
-			let transaction = newTransaction(domain, pool, options);
-			await new Promise(transaction)
-				.then(begin)
-				.then(negotiateSchema)
-				.then(() => fn(domain))
-				.then((res) => result = res)
-				.then(() => commit(domain))
-				.then(null, (e) => rollback(domain,e));
-			return result;
-		}
-
-		function begin() {
-			return _begin(domain, options);
-		}
-
-		function run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin)
-				.then(negotiateSchema);
-		}
-
-		function negotiateSchema(previous) {
-			let schema = options && options.schema;
-			if (!schema)
-				return previous;
-			return executeSchema(domain, schema);
-		}
-	};
-
-	c.createTransaction = function(options) {
-		let domain = createDomain();
-		let transaction = newTransaction(domain, pool, options);
-		let p = domain.run(() => new Promise(transaction)
-			.then(begin).then(negotiateSchema));
-
-		function run(fn) {
-			return p.then(domain.run.bind(domain, fn));
-		}
-
-		function begin() {
-			return _begin(domain, options);
-		}
-
-		function negotiateSchema(previous) {
-			let schema = options && options.schema;
-			if (!schema)
-				return previous;
-			return executeSchema(domain,schema);
-		}
-
-		run.rollback = rollback.bind(null, domain);
-		run.commit = commit.bind(null, domain);
-
-		return run;
-	};
-
-	c.query = function(query) {
-		let domain = createDomain();
-		let transaction = newTransaction(domain, pool);
-		let p = domain.run(() => new Promise(transaction)
-			.then(() => setSessionSingleton(domain, 'changes', []))
-			.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.lock = lock;
-	c.schema = executeSchema;
-
-	c.end = function() {
-		if (poolOptions)
-			return pool.end();
-		else
-			return Promise.resolve();
-	};
-
-	c.accept = function(caller) {
-		caller.visitPg();
-	};
-
-	return c;
-}
-
-module.exports = newDatabase;

package/src/bunPg/newPool.js

@@ -1,19 +0,0 @@
-const promisify = require('../promisify');
-const pools = require('../pools');
-const end = require('./pool/end');
-const newPgPool = require('./pool/newPgPool');
-const newId = require('../newId');
-
-function newPool(connectionString, poolOptions) {
-	let pool = newPgPool(connectionString, poolOptions);
-	let id = newId();
-	let boundEnd = end.bind(null, pool, id);
-	let c = {};
-
-	c.connect = pool.connect;
-	c.end = promisify(boundEnd);
-	pools[id] = c;
-	return c;
-}
-
-module.exports = newPool;

package/src/bunPg/pool/end.js

@@ -1,13 +0,0 @@
-var pools = require('../../pools');
-
-function endPool(pgPool, id, done) {
-	pgPool.drain(onDrained);
-
-	function onDrained() {
-		pgPool.destroyAllNow();
-		delete pools[id];
-		done();
-	}
-}
-
-module.exports = endPool;

package/src/bunPg/pool/newPgPool.js

@@ -1,98 +0,0 @@
-/* eslint-disable no-prototype-builtins */
-//slightly modified code from github.com/brianc/node-postgres
-var log = require('../../table/log');
-
-var defaults = require('../../poolDefaults');
-var genericPool = require('../../generic-pool');
-var pg;
-var parseSearchPathParam = require('../../pg/pool/parseSearchPathParam');
-
-function newPgPool(connectionString, poolOptions) {
-	poolOptions = poolOptions || {};
-
-	// @ts-ignore
-	var pool = genericPool.Pool({
-		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
-		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
-		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
-		log: poolOptions.log,
-		create: async function(cb) {
-			try {
-				if (!pg) {
-					const bunImport = await import('bun');
-					const { sql } = bunImport.default || bunImport;
-					pg = sql;
-				}
-			}
-			catch(e) {
-				return cb(e, null);
-			}
-			var client = new pg.Client(connectionString);
-			client.connect(function(err) {
-				if (err) return cb(err, null);
-
-				//handle connected client background errors by emitting event
-				//via the pg object and then removing errored client from the pool
-				client.on('error', function(e) {
-					pool.emit('error', e, client);
-
-					// If the client is already being destroyed, the error
-					// occurred during stream ending. Do not attempt to destroy
-					// the client again.
-					if (!client._destroying) {
-						pool.destroy(client);
-					}
-				});
-
-				// Remove connection from pool on disconnect
-				client.on('end', function(_e) {
-					// Do not enter infinite loop between pool.destroy
-					// and client 'end' event...
-					if (!client._destroying) {
-						pool.destroy(client);
-					}
-				});
-				client.poolCount = 0;
-				negotiateSearchPath(client, connectionString, (err) => cb(err, client));
-
-			});
-		},
-		destroy: function(client) {
-			client._destroying = true;
-			client.poolCount = undefined;
-			client.end();
-		}
-	});
-	//monkey-patch with connect method
-	pool.connect = function(cb) {
-		pool.acquire(function(err, client) {
-			if (err) return cb(err, null, function() {
-				/*NOOP*/
-			});
-			client.poolCount++;
-			cb(null, client, function(err) {
-				if (err) {
-					pool.destroy(client);
-				} else {
-					pool.release(client);
-				}
-			});
-		});
-	};
-	return pool;
-}
-
-function negotiateSearchPath(client, connectionString, cb) {
-	const searchPath = parseSearchPathParam(connectionString);
-	if (searchPath) {
-		const sql = `set search_path to ${searchPath}`;
-		log.emitQuery({sql, parameters: []});
-		return client.query(sql, cb);
-	}
-	else
-		cb();
-
-
-}
-
-module.exports = newPgPool;

package/src/bunPg/wrapQuery.js

@@ -1,33 +0,0 @@
-var log = require('../table/log');
-var replaceParamChar = require('../pg/replaceParamChar');
-
-function wrapQuery(connection) {
-	var runOriginalQuery = connection.query;
-	return runQuery;
-
-	function runQuery(query, onCompleted) {
-		var params = query.parameters;
-		var sql = replaceParamChar(query, params);
-		query = {
-			text: sql,
-			values: params,
-			types: query.types
-		};
-		log.emitQuery({sql, parameters: params});
-
-		runOriginalQuery.call(connection, query, onInnerCompleted);
-
-		function onInnerCompleted(err, result) {
-			if (err)
-				onCompleted(err);
-			else {
-				if (Array.isArray(result))
-					result = result[result.length-1];
-				onCompleted(null, result.rows);
-			}
-		}
-	}
-
-}
-
-module.exports = wrapQuery;

package/src/bunSqlite/newPool.js

@@ -1,19 +0,0 @@
-const promisify = require('../promisify');
-const pools = require('../pools');
-const end = require('../sqlite/pool/end');
-const newGenericPool = require('./pool/newGenericPool');
-const newId = require('../newId');
-
-function newPool(connectionString, poolOptions) {
-	let pool = newGenericPool(connectionString, poolOptions);
-	let id = newId();
-	let boundEnd = end.bind(null, pool, id);
-	let c = {};
-
-	c.connect = pool.connect;
-	c.end = promisify(boundEnd);
-	pools[id] = c;
-	return c;
-}
-
-module.exports = newPool;

package/src/bunSqlite/newTransaction.js

@@ -1,87 +0,0 @@
-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');
-const limitAndOffset = require('../sqlite/limitAndOffset');
-const insertSql = require('../sqlite/insertSql');
-const insert = require('../sqlite/insert');
-const quote = require('../sqlite/quote');
-
-function newResolveTransaction(domain, pool, { readonly = false } = {})  {
-	var rdb = {poolFactory: pool};
-	if (!pool.connect) {
-		pool = pool();
-		rdb.pool = pool;
-	}
-	rdb.engine = 'sqlite';
-	rdb.encodeBoolean = encodeBoolean;
-	rdb.encodeBinary = encodeBinary;
-	rdb.decodeBinary = decodeBinary;
-	rdb.decodeJSON = decodeJSON;
-	rdb.encodeJSON = JSON.stringify;
-	rdb.deleteFromSql = deleteFromSql;
-	rdb.selectForUpdateSql = selectForUpdateSql;
-	rdb.lastInsertedSql = lastInsertedSql;
-	rdb.insertSql = insertSql;
-	rdb.insert = insert;
-	rdb.lastInsertedIsSeparate = true;
-	rdb.multipleStatements = false;
-	rdb.limitAndOffset = limitAndOffset;
-	rdb.accept = function(caller) {
-		caller.visitSqlite();
-	};
-	rdb.aggregateCount = 0;
-	rdb.quote = quote;
-
-	if (readonly) {
-		rdb.dbClient = {
-			executeQuery: function(query, callback) {
-				pool.connect((err, client, done) => {
-					if (err) {
-						return callback(err);
-					}
-					try {
-						wrapQuery(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(client);
-				rdb.dbClient = client;
-				rdb.dbClientDone = done;
-				domain.rdb = rdb;
-				onSuccess();
-			} catch (e) {
-				onError(e);
-			}
-		}
-	};
-}
-
-function decodeJSON(value) {
-	return JSON.parse(value);
-}
-
-module.exports = newResolveTransaction;

package/src/bunSqlite/pool/newGenericPool.js

@@ -1,55 +0,0 @@
-/* eslint-disable no-prototype-builtins */
-var defaults = require('../../poolDefaults');
-
-var genericPool = require('../../generic-pool');
-var Database;
-
-function newGenericPool(connectionString, poolOptions) {
-	poolOptions = poolOptions || {};
-	var pool = genericPool.Pool({
-		max: poolOptions.size || poolOptions.poolSize || defaults.poolSize,
-		idleTimeoutMillis: poolOptions.idleTimeout || defaults.poolIdleTimeout,
-		reapIntervalMillis: poolOptions.reapIntervalMillis || defaults.reapIntervalMillis,
-		log: poolOptions.log || defaults.poolLog,
-		create: async function(cb) {
-			try {
-				try {
-					if (!Database)
-						({ Database } = await import('bun:Database'));
-				}
-				catch (err) {
-					return cb(err, null);
-				}
-
-				var client = new Database(connectionString);
-				client.poolCount = 0;
-				cb(null, client);
-			}
-			catch(err) {
-				return cb(err, null);
-			}
-		},
-
-		destroy: function(client) {
-			client.poolCount = undefined;
-			client.close();
-		}
-	});
-	//monkey-patch with connect method
-	pool.connect = function(cb) {
-		pool.acquire(function(err, client) {
-			if(err)  return cb(err, null, function() {/*NOOP*/});
-			client.poolCount++;
-			cb(null, client, function(err) {
-				if(err) {
-					pool.destroy(client);
-				} else {
-					pool.release(client);
-				}
-			});
-		});
-	};
-	return pool;
-}
-
-module.exports = newGenericPool;

package/src/bunSqlite/wrapQuery.js

@@ -1,23 +0,0 @@
-var log = require('../table/log');
-
-function wrapQuery(connection) {
-	return runQuery;
-
-	function runQuery(query, onCompleted) {
-		try {
-			var params = query.parameters;
-			var sql = query.sql();
-			log.emitQuery({ sql, parameters: params });
-
-			var statement = connection.query(sql);
-			const rows = statement.all.apply(statement, params);
-			onCompleted(null, rows);
-		}
-		catch (e) {
-			onCompleted(e);
-		}
-	}
-
-}
-
-module.exports = wrapQuery;

package/src/merge-browser.js

@@ -1,9 +0,0 @@
-const fs = require('fs').promises;
-
-async function merge() {
-	let data1 = await fs.readFile('./src/client/self.js', 'utf8');
-	let data2 = await fs.readFile('./dist/index.browser.mjs', 'utf8');
-	await fs.writeFile('./dist/index.browser.mjs', data1 + data2);
-}
-
-merge();

package/src/merge-server.js

@@ -1,9 +0,0 @@
-const fs = require('fs').promises;
-
-async function merge() {
-	let data1 = await fs.readFile('./src/client/self.js', 'utf8');
-	let data2 = await fs.readFile('./dist/index.mjs', 'utf8');
-	await fs.writeFile('./dist/index.mjs', data1 + data2);
-}
-
-merge();

package/src/nodeSqlite/decodeBinary.js

@@ -1,9 +0,0 @@
-function decodeBinary(u8Arr) {
-	let binaryString = '';
-	for (let i = 0; i < u8Arr.length; i++) {
-		binaryString += String.fromCharCode(u8Arr[i]);
-	}
-	return btoa(binaryString);
-}
-
-module.exports = decodeBinary;

package/src/nodeSqlite/encodeBinary.js

@@ -1,17 +0,0 @@
-function encodeBinary(base64) {
-	// Decode base64 to a binary string
-	const binaryString = atob(base64);
-
-	// Create a new Uint8Array with the same length as the binary string
-	const len = binaryString.length;
-	const bytes = new Uint8Array(len);
-
-	// Populate the Uint8Array with numeric character codes
-	for (let i = 0; i < len; i++) {
-		bytes[i] = binaryString.charCodeAt(i);
-	}
-
-	return bytes;
-}
-
-module.exports = encodeBinary;

package/src/nodeSqlite/newDatabase.js

@@ -1,116 +0,0 @@
-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 hostLocal = require('../hostLocal');
-let doQuery = require('../query');
-let releaseDbClient = require('../table/releaseDbClient');
-let setSessionSingleton = require('../table/setSessionSingleton');
-
-function newDatabase(connectionString, poolOptions) {
-	if (!connectionString)
-		throw new Error('Connection string cannot be empty');
-	var pool;
-	if (!poolOptions)
-		pool = newPool.bind(null,connectionString, poolOptions);
-	else
-		pool = newPool(connectionString, poolOptions);
-
-	let c = {poolFactory: pool, hostLocal, express};
-
-	c.transaction = function(options, fn) {
-		if ((arguments.length === 1) && (typeof options === 'function')) {
-			fn = options;
-			options = undefined;
-		}
-		let domain = createDomain();
-
-		if (fn)
-			return domain.run(runInTransaction);
-		else
-			return domain.run(run);
-
-		function begin() {
-			return _begin(domain, options);
-		}
-
-		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 run() {
-			let p;
-			let transaction = newTransaction(domain, pool, options);
-			p = new Promise(transaction);
-
-			return p.then(begin);
-		}
-
-	};
-
-	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(() => setSessionSingleton(domain, 'changes', []))
-			.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.visitSqlite();
-	};
-
-	return c;
-}
-
-module.exports = newDatabase;

package/src/nodeSqlite/newPool.js

@@ -1,19 +0,0 @@
-const promisify = require('../promisify');
-const pools = require('../pools');
-const end = require('../sqlite/pool/end');
-const newGenericPool = require('./pool/newGenericPool');
-const newId = require('../newId');
-
-function newPool(connectionString, poolOptions) {
-	let pool = newGenericPool(connectionString, poolOptions);
-	let id = newId();
-	let boundEnd = end.bind(null, pool, id);
-	let c = {};
-
-	c.connect = pool.connect;
-	c.end = promisify(boundEnd);
-	pools[id] = c;
-	return c;
-}
-
-module.exports = newPool;