removed promise and deferred

Lars-Erik Roald · Lars-Erik Roald · commit c89d99e2bec5 · 2025-02-04T07:30:03.000Z
diff --git a/package.json b/package.json
@@ -58,13 +58,11 @@
     "@types/tedious": "^4.0.14",
     "ajv": "^6.10.2",
     "axios": "^1.6.2",
-    "deferred": "^0.7.5",
     "fast-json-patch": "^3.1.1",
     "findup-sync": "^5.0.0",
     "glob": "^10.3.4",
     "module-definition": "^4.0.0",
     "node-cls": "^1.0.5",
-    "promise": "^8.0.3",
     "rfdc": "^1.2.0",
     "uuid": "^8.3.2",
     "wrangler": "^3.107.2"
@@ -100,6 +98,9 @@
     },
     "tedious": {
       "optional": true
+    },
+    "oracledb": {
+      "optional": true
     }
   },
   "devDependencies": {
diff --git a/src/d1/newDatabase.js b/src/d1/newDatabase.js
@@ -4,8 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let useHook = require('../useHook');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -55,10 +53,7 @@ function newDatabase(d1Database, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			if (useHook())
-				p = new Promise(transaction);
-			else
-				p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/d1/newPool.js b/src/d1/newPool.js
@@ -1,8 +1,8 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(d1Database, poolOptions) {
 	var pool = newGenericPool(d1Database, poolOptions);
@@ -11,7 +11,7 @@ function newPool(d1Database, poolOptions) {
 	var c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/mssql/newDatabase.js b/src/mssql/newDatabase.js
@@ -4,7 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -53,7 +52,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/mssql/newPool.js b/src/mssql/newPool.js
@@ -1,5 +1,5 @@
+const promisify = require('node:util').promisify;
 var pools = require('../pools');
-var promise = require('../table/promise');
 var end = require('./pool/end');
 var newGenericPool = require('./pool/newGenericPool');
 var newId = require('../newId');
@@ -11,7 +11,7 @@ function newPool(connectionString, poolOptions) {
 	var c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/mySql/newDatabase.js b/src/mySql/newDatabase.js
@@ -4,7 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -53,7 +52,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/mySql/newPool.js b/src/mySql/newPool.js
@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/oracle/newDatabase.js b/src/oracle/newDatabase.js
@@ -4,7 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -55,7 +54,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/oracle/newPool.js b/src/oracle/newPool.js
@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/pg/newDatabase.js b/src/pg/newDatabase.js
@@ -6,7 +6,6 @@ let rollback = require('../table/rollback');
 let newPool = require('./newPool');
 let lock = require('../lock');
 let executeSchema = require('./schema');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -61,7 +60,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin)
 				.then(negotiateSchema);
diff --git a/src/pg/newPool.js b/src/pg/newPool.js
@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newPgPool = require('./pool/newPgPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newPgPool = require('./pool/newPgPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newPgPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newPgPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/sap/newDatabase.js b/src/sap/newDatabase.js
@@ -4,7 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -55,7 +54,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/sap/newPool.js b/src/sap/newPool.js
@@ -1,5 +1,5 @@
+const promisify = require('node:util').promisify;
 var pools = require('../pools');
-var promise = require('../table/promise');
 var end = require('./pool/end');
 var newGenericPool = require('../mssql/pool/newGenericPool');
 var newId = require('../newId');
@@ -11,7 +11,7 @@ function newPool(connectionString, poolOptions) {
 	var c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/sqlite/newDatabase.js b/src/sqlite/newDatabase.js
@@ -4,7 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -53,7 +52,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/sqlite/newPool.js b/src/sqlite/newPool.js
@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/src/table/promise.js b/src/table/promise.js
@@ -1,13 +1,8 @@
-var promise = require('promise/domains');
-let promisify = require('util').promisify;
-
 function newPromise(func) {
 	if (!func)
 		return Promise.resolve.apply(Promise, arguments);
-		// return deferred.resolve.apply(deferred, arguments);
-	return new promise(func);
+	return new Promise(func);
 }
 
 newPromise.all = Promise.all;
-newPromise.denodeify = promisify || promise.denodeify;
 module.exports = newPromise;
diff --git a/src/table/rowArray/negotiateNextTick.js b/src/table/rowArray/negotiateNextTick.js
@@ -1,10 +1,9 @@
-var promise = require('promise/domains');
 
 function negotiateNextTick(i) {
 	if (i === 0)
 		return;
 	if (i % 1000 === 0)
-		return promise.resolve();
+		return Promise.resolve();
 	return;
 }
 
diff --git a/src/tedious/newDatabase.js b/src/tedious/newDatabase.js
@@ -4,7 +4,6 @@ let _begin = require('../table/begin');
 let commit = require('../table/commit');
 let rollback = require('../table/rollback');
 let newPool = require('./newPool');
-let promise = require('promise/domains');
 let express = require('../hostExpress');
 let hostLocal = require('../hostLocal');
 let doQuery = require('../query');
@@ -54,7 +53,7 @@ function newDatabase(connectionString, poolOptions) {
 		function run() {
 			let p;
 			let transaction = newTransaction(domain, pool, options);
-			p = new promise(transaction);
+			p = new Promise(transaction);
 
 			return p.then(begin);
 		}
diff --git a/src/tedious/newPool.js b/src/tedious/newPool.js
@@ -1,17 +1,17 @@
-var pools = require('../pools');
-var promise = require('../table/promise');
-var end = require('./pool/end');
-var newGenericPool = require('./pool/newGenericPool');
-var newId = require('../newId');
+const promisify = require('node:util').promisify;
+const pools = require('../pools');
+const end = require('./pool/end');
+const newGenericPool = require('./pool/newGenericPool');
+const newId = require('../newId');
 
 function newPool(connectionString, poolOptions) {
-	var pool = newGenericPool(connectionString, poolOptions);
-	var id = newId();
-	var boundEnd = end.bind(null, pool, id);
-	var c = {};
+	let pool = newGenericPool(connectionString, poolOptions);
+	let id = newId();
+	let boundEnd = end.bind(null, pool, id);
+	let c = {};
 
 	c.connect = pool.connect;
-	c.end = promise.denodeify(boundEnd);
+	c.end = promisify(boundEnd);
 	pools[id] = c;
 	return c;
 }
diff --git a/tests/d1.test.js b/tests/d1.test.js
@@ -58,7 +58,6 @@ describe('Cloudflare D1 Database Tests', () => {
 		const result = await d1.prepare('SELECT * FROM my_table WHERE name = ?')
 			.bind('test')
 			.all();
-		console.dir(result);
 
 		expect(result.results[0].name).toBe('test');
 		expect(result.results[0].value).toBe(123);
