@b9g/zen 0.1.4 → 0.1.5

package/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.1.5] - 2025-12-28
+
+### Fixed
+
+- `ensureTable()`, `ensureView()`, `ensureConstraints()`, `copyColumn()` no longer throw "cannot start a transaction within a transaction" when called inside `upgradeneeded` handler (#12)
+
 ## [0.1.4] - 2025-12-28
 
 ### Added

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/zen",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Define Zod tables. Write raw SQL. Get typed objects.",
   "keywords": [
     "database",

package/src/zen.js

@@ -1236,6 +1236,7 @@ var Database = class extends EventTarget {
   #version = 0;
   #opened = false;
   #tables = [];
+  #inMigrationLock = false;
   constructor(driver, options) {
     super();
     this.#driver = driver;
@@ -1282,9 +1283,19 @@ var Database = class extends EventTarget {
       }
     };
     if (this.#driver.withMigrationLock) {
-      await this.#driver.withMigrationLock(runMigration);
+      this.#inMigrationLock = true;
+      try {
+        await this.#driver.withMigrationLock(runMigration);
+      } finally {
+        this.#inMigrationLock = false;
+      }
     } else {
-      await this.#driver.transaction(runMigration);
+      this.#inMigrationLock = true;
+      try {
+        await this.#driver.transaction(runMigration);
+      } finally {
+        this.#inMigrationLock = false;
+      }
     }
     this.#version = version;
     this.#opened = true;
@@ -2071,6 +2082,9 @@ var Database = class extends EventTarget {
       );
     }
     const doEnsure = () => this.#driver.ensureTable(table2);
+    if (this.#inMigrationLock) {
+      return await doEnsure();
+    }
     if (this.#driver.withMigrationLock) {
       return await this.#driver.withMigrationLock(doEnsure);
     }
@@ -2094,6 +2108,9 @@ var Database = class extends EventTarget {
       );
     }
     const doEnsure = () => this.#driver.ensureView(viewObj);
+    if (this.#inMigrationLock) {
+      return await doEnsure();
+    }
     if (this.#driver.withMigrationLock) {
       return await this.#driver.withMigrationLock(doEnsure);
     }
@@ -2128,6 +2145,9 @@ var Database = class extends EventTarget {
       );
     }
     const doEnsure = () => this.#driver.ensureConstraints(table2);
+    if (this.#inMigrationLock) {
+      return await doEnsure();
+    }
     if (this.#driver.withMigrationLock) {
       return await this.#driver.withMigrationLock(doEnsure);
     }
@@ -2163,6 +2183,9 @@ var Database = class extends EventTarget {
     }
     if (this.#driver.copyColumn) {
       const doCopy2 = () => this.#driver.copyColumn(table2, fromField, toField);
+      if (this.#inMigrationLock) {
+        return await doCopy2();
+      }
       if (this.#driver.withMigrationLock) {
         return await this.#driver.withMigrationLock(doCopy2);
       }
@@ -2200,6 +2223,9 @@ var Database = class extends EventTarget {
         );
       }
     };
+    if (this.#inMigrationLock) {
+      return await doCopy();
+    }
     if (this.#driver.withMigrationLock) {
       return await this.#driver.withMigrationLock(doCopy);
     }