@flowblade/sqlduck 0.34.0 → 0.35.0

package/dist/index.d.mts

@@ -381,6 +381,14 @@ declare class DuckDatabaseManager {
   analyze: () => Promise<boolean>;
   checkpoint: (dbAlias: string) => Promise<boolean>;
   vacuum: () => Promise<boolean>;
+  getCurrentDatabase: () => Promise<string | null>;
+  getCurrentSchema: () => Promise<string | null>;
+  getCurrentCatalog: () => Promise<string | null>;
+  /**
+   * Set the default database to use
+   * @throws if the database alias does not exist
+   */
+  use: (dbAlias: string) => Promise<true>;
   /**
    * Helper to create an initial database file.
    */

package/dist/index.mjs

@@ -425,22 +425,33 @@ var DuckDatabaseManager = class {
 	*/
 	attach = async (dbParams, options) => {
 		const params = duckConnectionParamsZodSchema.parse(dbParams);
-		const rawSql = new DuckDatabaseAttachCommand(params, options).getRawSql();
-		const { behaviour } = options ?? {};
+		const rawSql = new DuckDatabaseAttachCommand(params, { behaviour: options?.behaviour }).getRawSql();
+		const restoreCurrentDb = await this.getCurrentDatabase();
+		const tempDbNameHack = "temp_run_detach_if_attached_hack_db";
+		let isTempDbNameHackCreated = false;
 		try {
-			await this.#executor.getRowObjectsJS([
-				`attach(${params.alias}`,
-				behaviour ?? null,
-				")"
-			].filter(Boolean).join(","), rawSql);
+			await this.#executor.getRowObjectsJS([`attach(${params.alias}`, options === void 0 ? null : JSON.stringify(options)].filter(Boolean).join(",") + ")", rawSql);
 		} catch (e) {
 			if (options?.behaviour === "OR REPLACE" && options?.runDetachIfAttachOrReplaceFailWithAlreadyAttached === true) {
 				const alreadyAttached = getAlreadyAttachedDatabaseFromError(e);
 				if (alreadyAttached.isAlreadyAttached === true) {
+					if (alreadyAttached.dbAlias === restoreCurrentDb) {
+						await this.attachIfNotExists({
+							type: "memory",
+							alias: tempDbNameHack
+						});
+						await this.use(tempDbNameHack);
+						isTempDbNameHackCreated = true;
+					}
 					await this.detachOrIgnore(alreadyAttached.dbAlias);
 					await this.attach(dbParams);
 				} else throw e;
 			} else throw e;
+		} finally {
+			if (restoreCurrentDb !== null && isTempDbNameHackCreated) {
+				await this.use(restoreCurrentDb);
+				await this.detachOrIgnore(tempDbNameHack);
+			}
 		}
 		return new Database({ alias: params.alias });
 	};
@@ -576,6 +587,24 @@ var DuckDatabaseManager = class {
 		await this.#executor.getRowObjectsJS("vacuum()", "VACUUM");
 		return true;
 	};
+	getCurrentDatabase = async () => {
+		return (await this.#executor.getRowObjectsJS("getCurrentDatabase()", "SELECT current_database() as current_database"))[0]?.current_database ?? null;
+	};
+	getCurrentSchema = async () => {
+		return (await this.#executor.getRowObjectsJS("getCurrentSchema()", "SELECT current_schema() as current_schema"))?.[0]?.current_schema ?? null;
+	};
+	getCurrentCatalog = async () => {
+		return (await this.#executor.getRowObjectsJS("getCurrentCatalog()", "SELECT current_catalog() as current_catalog"))?.[0]?.current_catalog ?? null;
+	};
+	/**
+	* Set the default database to use
+	* @throws if the database alias does not exist
+	*/
+	use = async (dbAlias) => {
+		const safeAlias = duckValidatorsZod.aliasName.parse(dbAlias);
+		await this.#executor.getRowObjectsJS(`use(${safeAlias})`, `USE ${safeAlias}`);
+		return true;
+	};
 	/**
 	* Helper to create an initial database file.
 	*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowblade/sqlduck",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "type": "module",
   "sideEffects": false,
   "exports": {