Handle errors for async IndexedDB operations to fix #845 (#2314)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: mathiasrw <[email protected]>

Author: Copilot

src/91indexeddb.js

@@ -79,18 +79,29 @@ IDB.showDatabases = function (like, cb) {
 
 IDB.createDatabase = async function (ixdbid, args, ifnotexists, dbid, cb) {
 	const found = await _databaseExists(ixdbid).catch(err => {
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return null;
+		}
 		throw err;
 	});
 
+	if (found === null) {
+		return; // Error already handled via callback
+	}
+
 	if (found) {
 		if (ifnotexists) {
 			cb && cb(0);
 		} else {
 			const err = new Error(
 				`IndexedDB: Cannot create new database "${ixdbid}" because it already exists`
 			);
-			if (cb) cb(null, err);
+			if (cb) {
+				cb(null, err);
+				return;
+			}
+			throw err;
 		}
 	} else {
 		const request = indexedDB.open(ixdbid, 1);
@@ -103,10 +114,17 @@ IDB.createDatabase = async function (ixdbid, args, ifnotexists, dbid, cb) {
 
 IDB.dropDatabase = async function (ixdbid, ifexists, cb) {
 	const found = await _databaseExists(ixdbid).catch(err => {
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return null;
+		}
 		throw err;
 	});
 
+	if (found === null) {
+		return; // Error already handled via callback
+	}
+
 	if (found) {
 		const request = indexedDB.deleteDatabase(ixdbid);
 		request.onsuccess = () => {
@@ -116,26 +134,39 @@ IDB.dropDatabase = async function (ixdbid, ifexists, cb) {
 		if (ifexists) {
 			cb && cb(0);
 		} else {
-			cb &&
+			if (cb) {
 				cb(
 					null,
-					new Error(`IndexedDB: Cannot drop new database "${ixdbid}" because it does not exist'`)
+					new Error(`IndexedDB: Cannot drop database "${ixdbid}" because it does not exist`)
 				);
+				return;
+			}
+			throw new Error(`IndexedDB: Cannot drop database "${ixdbid}" because it does not exist`);
 		}
 	}
 };
 
 IDB.attachDatabase = async function (ixdbid, dbid, args, params, cb) {
 	const found = await _databaseExists(ixdbid).catch(err => {
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return null;
+		}
 		throw err;
 	});
 
+	if (found === null) {
+		return; // Error already handled via callback
+	}
+
 	if (!found) {
 		const err = new Error(
 			`IndexedDB: Cannot attach database "${ixdbid}" because it does not exist`
 		);
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return;
+		}
 		throw err;
 	}
 
@@ -172,15 +203,25 @@ IDB.attachDatabase = async function (ixdbid, dbid, args, params, cb) {
 IDB.createTable = async function (databaseid, tableid, ifnotexists, cb) {
 	const ixdbid = alasql.databases[databaseid].ixdbid;
 	const found = await _databaseExists(ixdbid).catch(err => {
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return null;
+		}
 		throw err;
 	});
 
+	if (found === null) {
+		return; // Error already handled via callback
+	}
+
 	if (!found) {
 		const err = new Error(
 			'IndexedDB: Cannot create table in database "' + ixdbid + '" because it does not exist'
 		);
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return;
+		}
 		throw err;
 	}
 
@@ -206,15 +247,25 @@ IDB.createTable = async function (databaseid, tableid, ifnotexists, cb) {
 IDB.dropTable = async function (databaseid, tableid, ifexists, cb) {
 	const ixdbid = alasql.databases[databaseid].ixdbid;
 	const found = await _databaseExists(ixdbid).catch(err => {
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return null;
+		}
 		throw err;
 	});
 
+	if (found === null) {
+		return; // Error already handled via callback
+	}
+
 	if (!found) {
 		const err = new Error(
 			'IndexedDB: Cannot drop table in database "' + ixdbid + '" because it does not exist'
 		);
-		if (cb) cb(null, err);
+		if (cb) {
+			cb(null, err);
+			return;
+		}
 		throw err;
 	}
 

test/test845-B.js

@@ -0,0 +1,67 @@
+if (typeof exports === 'object') {
+	var assert = require('assert');
+	var alasql = require('..');
+} else {
+	__dirname = '.';
+}
+
+/*
+  Test for issue #845 - Problem catching errors using the simple notation
+*/
+
+var test = '845-B';
+
+if (typeof exports != 'object') {
+	describe('Test ' + test + ' - Error handling with ATTACH IndexedDB', function () {
+		it('1. Should catch error when attaching non-existent database with errorlog enabled', function (done) {
+			alasql.options.errorlog = true;
+			alasql('ATTACH INDEXEDDB DATABASE nonExistentDB845;', function (data, err) {
+				assert(err, 'Error should be passed to callback');
+				assert(
+					err.message.includes('does not exist'),
+					'Error message should indicate database does not exist'
+				);
+				alasql.options.errorlog = false;
+				done();
+			});
+		});
+
+		it('2. Should catch error using errorlog function', function (done) {
+			var errorCaught = false;
+			alasql.options.errorlog = function (err) {
+				errorCaught = true;
+				assert(err, 'Error should be passed to errorlog function');
+			};
+			alasql('ATTACH INDEXEDDB DATABASE nonExistentDB845b;', function (data, err) {
+				assert(err, 'Error should also be passed to callback');
+				alasql.options.errorlog = false;
+				done();
+			});
+		});
+
+		it('3. Should work when database exists', async function () {
+			// First create a database
+			await alasql.promise('DROP INDEXEDDB DATABASE IF EXISTS testDB845');
+			await alasql.promise('CREATE INDEXEDDB DATABASE testDB845');
+
+			// Now attach it with error handling enabled
+			alasql.options.errorlog = true;
+			const result = await new Promise((resolve, reject) => {
+				alasql('ATTACH INDEXEDDB DATABASE testDB845;', function (data, err) {
+					if (err) {
+						reject(err);
+					} else {
+						resolve(data);
+					}
+				});
+			});
+
+			assert.equal(result, 1, 'Should successfully attach existing database');
+			alasql.options.errorlog = false;
+
+			// Cleanup
+			await alasql.promise('DETACH DATABASE testDB845');
+			await alasql.promise('DROP INDEXEDDB DATABASE testDB845');
+		});
+	});
+}