velocious 1.0.567 → 1.0.569

package/build/database/drivers/index-metadata.js

@@ -0,0 +1,28 @@
+// @ts-check
+
+import { forcedBoolean, forcedString } from "typanic"
+
+/**
+ * IndexMetadataType type.
+ * @typedef {object} IndexMetadataType
+ * @property {string} column_name - Index column name.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
+
+/**
+ * Normalizes one untrusted database index metadata row.
+ * @param {import("./base.js").QueryRowType} row - Database index metadata row.
+ * @returns {IndexMetadataType} - Validated index metadata.
+ */
+export function normalizeIndexMetadataRow(row) {
+  return {
+    column_name: forcedString(row.column_name, "index column_name"),
+    index_name: forcedString(row.index_name, "index index_name"),
+    is_primary_key: forcedBoolean(row.is_primary_key, "index is_primary_key"),
+    is_unique: forcedBoolean(row.is_unique, "index is_unique"),
+    table_name: forcedString(row.table_name, "index table_name")
+  }
+}

package/build/database/drivers/mssql/column.js

@@ -1,7 +1,6 @@
 // @ts-check
 
 import BaseColumn from "../base-column.js"
-import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 
 export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
@@ -19,39 +18,9 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
   getAutoIncrement() { return digg(this, "data", "isIdentity") === 1 }
 
   async getIndexes() {
-    const options = this.getOptions()
-    const sql = `
-      SELECT
-        sys.tables.name AS TableName,
-        sys.columns.name AS ColumnName,
-        sys.indexes.name AS index_name,
-        sys.indexes.type_desc AS IndexType,
-        sys.index_columns.is_included_column AS IsIncludedColumn,
-        sys.indexes.is_unique,
-        sys.indexes.is_primary_key,
-        sys.indexes.is_unique_constraint
-      FROM sys.indexes
-      INNER JOIN sys.index_columns ON sys.indexes.object_id = sys.index_columns.object_id AND sys.indexes.index_id = sys.index_columns.index_id
-      INNER JOIN sys.columns ON sys.index_columns.object_id = sys.columns.object_id AND sys.index_columns.column_id = sys.columns.column_id
-      INNER JOIN sys.tables ON sys.indexes.object_id = sys.tables.object_id
-      WHERE
-        sys.tables.name = ${options.quote(this.getTable().getName())} AND
-        sys.columns.name = ${options.quote(this.getName())}
-      ORDER BY
-        sys.indexes.name,
-        sys.index_columns.key_ordinal
-    `
+    const indexes = await this.getTable().getIndexes()
 
-    const rows = await this.getDriver().query(sql)
-    const indexes = []
-
-    for (const row of rows) {
-      const index = new ColumnsIndex(this.getTable(), row)
-
-      indexes.push(index)
-    }
-
-    return indexes
+    return indexes.filter((index) => index.getColumnNames().includes(this.getName()))
   }
 
   getDefault() { return digg(this, "data", "COLUMN_DEFAULT") }
@@ -71,4 +40,3 @@ export default class VelociousDatabaseDriversMssqlColumn extends BaseColumn {
   getPrimaryKey() { return digg(this, "data", "isIdentity") === 1 }
   getType() { return digg(this, "data", "DATA_TYPE") }
 }
-

package/build/database/drivers/mssql/columns-index.js

@@ -1,6 +1,43 @@
 // @ts-check
 
 import BaseColumnsIndex from "../base-columns-index.js"
+import TableIndex from "../../table-data/table-index.js"
+
+/**
+ * MssqlColumnsIndexDataType type.
+ * @typedef {object} MssqlColumnsIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
 
 export default class VelociousDatabaseDriversMssqlColumnsIndex extends BaseColumnsIndex {
+  /**
+   * Runs constructor.
+   * @param {import("../base-table.js").default} table - Table.
+   * @param {MssqlColumnsIndexDataType} data - Grouped index metadata.
+   */
+  constructor(table, data) {
+    super(table, data)
+    this.indexData = data
+  }
+
+  /**
+   * Runs get column names.
+   * @returns {string[]} - Ordered index column names.
+   */
+  getColumnNames() { return this.indexData.columnNames }
+
+  /**
+   * Runs get table data index.
+   * @returns {TableIndex} - Table-data index.
+   */
+  getTableDataIndex() {
+    return new TableIndex(this.getColumnNames(), {
+      name: this.getName(),
+      unique: this.isUnique()
+    })
+  }
 }

package/build/database/drivers/mssql/index.js

@@ -463,8 +463,8 @@ export default class VelociousDatabaseDriversMssql extends Base{
     })
   }
 
-  async lastInsertID() {
-    const result = await this.query("SELECT SCOPE_IDENTITY() AS last_insert_id")
+  async lastInsertID(options = {}) {
+    const result = await this.query("SELECT SCOPE_IDENTITY() AS last_insert_id", options)
     const lastInsertID = digg(result, 0, "last_insert_id")
 
     if (lastInsertID === null) throw new Error("Couldn't get the last inserted ID")
@@ -534,29 +534,32 @@ export default class VelociousDatabaseDriversMssql extends Base{
   /**
    * Runs start save point action.
    * @param {string} savePointName - Save point name.
+   * @param {Pick<import("../base.js").QueryOptions, "operationOwner">} [options] - Transaction ownership.
    * @returns {Promise<void>} - Resolves when complete.
    */
-  async _startSavePointAction(savePointName) {
-    await this.query(`SAVE TRANSACTION [${savePointName}]`)
+  async _startSavePointAction(savePointName, options = {}) {
+    await this.query(`SAVE TRANSACTION [${savePointName}]`, options)
   }
 
   /**
    * Runs release save point action.
    * @param {string} savePointName - Save point name.
+   * @param {Pick<import("../base.js").QueryOptions, "operationOwner">} [_options] - Transaction ownership.
    * @returns {Promise<void>} - Resolves when complete.
    */
-  async _releaseSavePointAction(savePointName) { // eslint-disable-line no-unused-vars
+  async _releaseSavePointAction(savePointName, _options = {}) {
     // Do nothing in MS-SQL.
   }
 
   /**
    * Runs rollback save point action.
    * @param {string} savePointName - Save point name.
+   * @param {Pick<import("../base.js").QueryOptions, "operationOwner">} [options] - Transaction ownership.
    * @returns {Promise<void>} - Resolves when complete.
    */
-  async _rollbackSavePointAction(savePointName) {
+  async _rollbackSavePointAction(savePointName, options = {}) {
     try {
-      await this.query(`ROLLBACK TRANSACTION [${savePointName}]`)
+      await this.query(`ROLLBACK TRANSACTION [${savePointName}]`, options)
     } catch (error) {
       const message = error instanceof Error ? error.message : `${error}`
 

package/build/database/drivers/mssql/table.js

@@ -5,6 +5,51 @@ import Column from "./column.js"
 import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 import ForeignKey from "./foreign-key.js"
+import { normalizeIndexMetadataRow } from "../index-metadata.js"
+
+/**
+ * MssqlGroupedIndexDataType type.
+ * @typedef {object} MssqlGroupedIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
+
+/**
+ * Groups ordered SQL Server index rows into one metadata value per index.
+ * @param {import("../index-metadata.js").IndexMetadataType[]} indexRows - Ordered index metadata rows.
+ * @returns {MssqlGroupedIndexDataType[]} - Grouped index metadata.
+ */
+export function groupMssqlIndexRows(indexRows) {
+  /** @type {Map<string, MssqlGroupedIndexDataType>} */
+  const indexDataByName = new Map()
+  /** @type {MssqlGroupedIndexDataType[]} */
+  const groupedIndexData = []
+
+  for (const indexRow of indexRows) {
+    const existingIndexData = indexDataByName.get(indexRow.index_name)
+
+    if (existingIndexData) {
+      existingIndexData.columnNames.push(indexRow.column_name)
+      continue
+    }
+
+    const indexData = {
+      columnNames: [indexRow.column_name],
+      index_name: indexRow.index_name,
+      is_primary_key: indexRow.is_primary_key,
+      is_unique: indexRow.is_unique,
+      table_name: indexRow.table_name
+    }
+
+    indexDataByName.set(indexRow.index_name, indexData)
+    groupedIndexData.push(indexData)
+  }
+
+  return groupedIndexData
+}
 
 export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
   /**
@@ -43,7 +88,7 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
     return await this.getDriver()._cachedTableSchemaMetadata(this.getName(), "foreignKeys", async () => {
       const sql = `
         SELECT
-            fk.name AS ForeignKeyName,
+            fk.name AS CONSTRAINT_NAME,
             tp.name AS ParentTable,
             ref.name AS ReferencedTable,
             cp.name AS ParentColumn,
@@ -63,7 +108,7 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
             ON fkc.referenced_object_id = cref.object_id
             AND fkc.referenced_column_id = cref.column_id
         WHERE tp.name = ${this.driver.quote(this.getName())}
-        ORDER BY ForeignKeyName, ParentTable, ReferencedTable;
+        ORDER BY CONSTRAINT_NAME, ParentTable, ReferencedTable;
       `
 
       const foreignKeyRows = await this.driver.query(sql)
@@ -84,20 +129,18 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
       const options = this.getOptions()
       const sql = `
         SELECT
-          sys.tables.name AS TableName,
-          sys.columns.name AS ColumnName,
+          sys.tables.name AS table_name,
+          sys.columns.name AS column_name,
           sys.indexes.name AS index_name,
-          sys.indexes.type_desc AS IndexType,
-          sys.index_columns.is_included_column AS IsIncludedColumn,
           sys.indexes.is_unique,
-          sys.indexes.is_primary_key,
-          sys.indexes.is_unique_constraint
+          sys.indexes.is_primary_key
         FROM sys.indexes
         INNER JOIN sys.index_columns ON sys.indexes.object_id = sys.index_columns.object_id AND sys.indexes.index_id = sys.index_columns.index_id
         INNER JOIN sys.columns ON sys.index_columns.object_id = sys.columns.object_id AND sys.index_columns.column_id = sys.columns.column_id
         INNER JOIN sys.tables ON sys.indexes.object_id = sys.tables.object_id
         WHERE
-          sys.tables.name = ${options.quote(this.getName())}
+          sys.tables.name = ${options.quote(this.getName())} AND
+          sys.index_columns.is_included_column = 0
         ORDER BY
           sys.indexes.name,
           sys.index_columns.key_ordinal
@@ -105,9 +148,10 @@ export default class VelociousDatabaseDriversMssqlTable extends BaseTable {
 
       const rows = await this.getDriver().query(sql)
       const indexes = []
+      const indexRows = rows.map((row) => normalizeIndexMetadataRow(row))
 
-      for (const row of rows) {
-        const index = new ColumnsIndex(this, row)
+      for (const indexData of groupMssqlIndexRows(indexRows)) {
+        const index = new ColumnsIndex(this, indexData)
 
         indexes.push(index)
       }

package/build/database/drivers/mysql/index.js

@@ -403,9 +403,12 @@ export default class VelociousDatabaseDriversMysql extends Base{
    * large result set is read incrementally instead of being buffered. Overrides the base
    * buffered fallback with true server-side streaming.
    * @param {string} sql - SQL string to stream.
+   * @param {import("../base.js").QueryOptions} [options] - Query ownership options.
    * @yields {Record<string, unknown>} - The result rows, one at a time.
    */
-  async *queryStream(sql) {
+  async *queryStream(sql, options = {}) {
+    await this._waitForOperationLease(options.operationOwner)
+
     if (!this.pool) await this.connect()
     if (!this.pool) throw new Error("MySQL pool failed to initialize")
 
@@ -554,10 +557,11 @@ export default class VelociousDatabaseDriversMysql extends Base{
 
   /**
    * Runs last insert id.
+   * @param {import("../base.js").QueryOptions} [options] - Query ownership options.
    * @returns {Promise<number>} - Resolves with the last insert id.
    */
-  async lastInsertID() {
-    const result = await this.query("SELECT LAST_INSERT_ID() AS last_insert_id")
+  async lastInsertID(options = {}) {
+    const result = await this.query("SELECT LAST_INSERT_ID() AS last_insert_id", options)
 
     return digg(result, 0, "last_insert_id")
   }
@@ -574,10 +578,11 @@ export default class VelociousDatabaseDriversMysql extends Base{
 
   /**
    * Runs start transaction action.
+   * @param {Pick<import("../base.js").QueryOptions, "operationOwner">} [options] - Transaction ownership.
    * @returns {Promise<void>} - Resolves when complete.
    */
-  async _startTransactionAction() {
-    await this.query("START TRANSACTION")
+  async _startTransactionAction(options = {}) {
+    await this.query("START TRANSACTION", options)
   }
 
   /**

package/build/database/drivers/mysql/sql/alter-table.js

@@ -4,6 +4,19 @@ import AlterTableBase from "../../../query/alter-table-base.js"
 import TableColumn from "../../../table-data/table-column.js"
 
 export default class VelociousDatabaseConnectionDriversMysqlSqlAlterTable extends AlterTableBase {
+  /**
+   * Runs get drop foreign key sql.
+   * @param {import("../../../table-data/table-foreign-key.js").default} foreignKey - Foreign key to drop.
+   * @returns {string} - SQL fragment that removes the foreign key.
+   */
+  getDropForeignKeySQL(foreignKey) {
+    const name = foreignKey.getName()
+
+    if (!name) throw new Error(`Cannot remove unnamed foreign key on ${foreignKey.getTableName()}.${foreignKey.getColumnName()}`)
+
+    return `DROP FOREIGN KEY ${this.getOptions().quoteIndexName(name)}`
+  }
+
   /**
    * Builds MySQL ALTER TABLE statements, adding indexes atomically with columns.
    * @returns {Promise<string[]>} - Resolves with SQL statements.

package/build/database/drivers/pgsql/column.js

@@ -1,7 +1,6 @@
 // @ts-check
 
 import BaseColumn from "../base-column.js"
-import ColumnsIndex from "./columns-index.js"
 import {digg} from "diggerize"
 
 export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
@@ -25,33 +24,9 @@ export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumn {
   }
 
   async getIndexes() {
-    const options = this.getOptions()
+    const indexes = await this.getTable().getIndexes()
 
-    const indexesRows = await this.table.getDriver().query(`
-      SELECT
-        pg_attribute.attname AS column_name,
-        pg_index.indexrelid::regclass as index_name,
-        pg_class.relnamespace::regnamespace as schema_name,
-        pg_class.relname as table_name,
-        pg_index.indisprimary as is_primary_key,
-        pg_index.indisunique as is_unique
-      FROM pg_index
-      JOIN pg_class ON pg_class.oid = pg_index.indrelid
-      JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey)
-      WHERE
-        pg_attribute.attname = ${options.quote(this.getName())} AND
-        pg_class.relname = ${options.quote(this.getTable().getName())}
-    `)
-
-    const indexes = []
-
-    for (const indexRow of indexesRows) {
-      const columnsIndex = new ColumnsIndex(this.getTable(), indexRow)
-
-      indexes.push(columnsIndex)
-    }
-
-    return indexes
+    return indexes.filter((index) => index.getColumnNames().includes(this.getName()))
   }
 
   getDefault() {

package/build/database/drivers/pgsql/columns-index.js

@@ -1,6 +1,43 @@
 // @ts-check
 
 import BaseColumnsIndex from "../base-columns-index.js"
+import TableIndex from "../../table-data/table-index.js"
+
+/**
+ * PgsqlColumnsIndexDataType type.
+ * @typedef {object} PgsqlColumnsIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
 
 export default class VelociousDatabaseDriversPgsqlColumn extends BaseColumnsIndex {
+  /**
+   * Runs constructor.
+   * @param {import("../base-table.js").default} table - Table.
+   * @param {PgsqlColumnsIndexDataType} data - Grouped index metadata.
+   */
+  constructor(table, data) {
+    super(table, data)
+    this.indexData = data
+  }
+
+  /**
+   * Runs get column names.
+   * @returns {string[]} - Ordered index column names.
+   */
+  getColumnNames() { return this.indexData.columnNames }
+
+  /**
+   * Runs get table data index.
+   * @returns {TableIndex} - Table-data index.
+   */
+  getTableDataIndex() {
+    return new TableIndex(this.getColumnNames(), {
+      name: this.getName(),
+      unique: this.isUnique()
+    })
+  }
 }

package/build/database/drivers/pgsql/index.js

@@ -326,8 +326,8 @@ export default class VelociousDatabaseDriversPgsql extends Base{
     })
   }
 
-  async lastInsertID() {
-    const result = await this.query("SELECT LASTVAL() AS last_insert_id")
+  async lastInsertID(options = {}) {
+    const result = await this.query("SELECT LASTVAL() AS last_insert_id", options)
 
     return digg(result, 0, "last_insert_id")
   }
@@ -338,8 +338,8 @@ export default class VelociousDatabaseDriversPgsql extends Base{
     return this._options
   }
 
-  async _startTransactionAction() {
-    await this.query("START TRANSACTION")
+  async _startTransactionAction(options = {}) {
+    await this.query("START TRANSACTION", options)
   }
 
   /**

package/build/database/drivers/pgsql/table.js

@@ -4,6 +4,51 @@ import BaseTable from "../base-table.js"
 import Column from "./column.js"
 import ColumnsIndex from "./columns-index.js"
 import ForeignKey from "./foreign-key.js"
+import { normalizeIndexMetadataRow } from "../index-metadata.js"
+
+/**
+ * PgsqlGroupedIndexDataType type.
+ * @typedef {object} PgsqlGroupedIndexDataType
+ * @property {string[]} columnNames - Ordered index column names.
+ * @property {string} index_name - Index name.
+ * @property {boolean} is_primary_key - Whether the index is primary.
+ * @property {boolean} is_unique - Whether the index is unique.
+ * @property {string} table_name - Table name.
+ */
+
+/**
+ * Groups ordered PostgreSQL index rows into one metadata value per index.
+ * @param {import("../index-metadata.js").IndexMetadataType[]} indexRows - Ordered index metadata rows.
+ * @returns {PgsqlGroupedIndexDataType[]} - Grouped index metadata.
+ */
+export function groupPgsqlIndexRows(indexRows) {
+  /** @type {Map<string, PgsqlGroupedIndexDataType>} */
+  const indexDataByName = new Map()
+  /** @type {PgsqlGroupedIndexDataType[]} */
+  const groupedIndexData = []
+
+  for (const indexRow of indexRows) {
+    const existingIndexData = indexDataByName.get(indexRow.index_name)
+
+    if (existingIndexData) {
+      existingIndexData.columnNames.push(indexRow.column_name)
+      continue
+    }
+
+    const indexData = {
+      columnNames: [indexRow.column_name],
+      index_name: indexRow.index_name,
+      is_primary_key: indexRow.is_primary_key,
+      is_unique: indexRow.is_unique,
+      table_name: indexRow.table_name
+    }
+
+    indexDataByName.set(indexRow.index_name, indexData)
+    groupedIndexData.push(indexData)
+  }
+
+  return groupedIndexData
+}
 
 export default class VelociousDatabaseDriversPgsqlTable extends BaseTable {
   /**
@@ -100,23 +145,29 @@ export default class VelociousDatabaseDriversPgsqlTable extends BaseTable {
 
       const indexesRows = await this.getDriver().query(`
         SELECT
-          pg_attribute.attname AS column_name,
-          pg_index.indexrelid::regclass as index_name,
-          pg_class.relnamespace::regnamespace as schema_name,
-          pg_class.relname as table_name,
-          pg_index.indisprimary as is_primary_key,
-          pg_index.indisunique as is_unique
+          index_attribute.attname AS column_name,
+          pg_index.indexrelid::regclass AS index_name,
+          pg_class.relname AS table_name,
+          pg_index.indisprimary AS is_primary_key,
+          pg_index.indisunique AS is_unique
         FROM pg_index
         JOIN pg_class ON pg_class.oid = pg_index.indrelid
-        JOIN pg_attribute ON pg_attribute.attrelid = pg_class.oid AND pg_attribute.attnum = ANY(pg_index.indkey)
+        JOIN LATERAL unnest(pg_index.indkey) WITH ORDINALITY AS index_columns(attribute_number, ordinal_position) ON true
+        JOIN pg_attribute AS index_attribute ON index_attribute.attrelid = pg_class.oid AND index_attribute.attnum = index_columns.attribute_number
         WHERE
-          pg_class.relname = ${options.quote(this.getName())}
+          pg_class.relname = ${options.quote(this.getName())} AND
+          index_columns.ordinal_position <= pg_index.indnkeyatts
+        ORDER BY
+          pg_index.indexrelid,
+          index_columns.ordinal_position
       `)
 
       const indexes = []
 
-      for (const indexRow of indexesRows) {
-        const columnsIndex = new ColumnsIndex(this, indexRow)
+      const indexRows = indexesRows.map((indexRow) => normalizeIndexMetadataRow(indexRow))
+
+      for (const indexData of groupPgsqlIndexRows(indexRows)) {
+        const columnsIndex = new ColumnsIndex(this, indexData)
 
         indexes.push(columnsIndex)
       }

package/build/database/drivers/sqlite/base.js

@@ -262,8 +262,8 @@ export default class VelociousDatabaseDriversSqliteBase extends Base {
     })
   }
 
-  async lastInsertID() {
-    const result = await this.query("SELECT LAST_INSERT_ROWID() AS last_insert_id")
+  async lastInsertID(options = {}) {
+    const result = await this.query("SELECT LAST_INSERT_ROWID() AS last_insert_id", options)
 
     return digg(result, 0, "last_insert_id")
   }

package/build/database/drivers/sqlite/connection-sql-js.js

@@ -1,6 +1,7 @@
 // @ts-check
 
 import debounce from "debounce"
+import Mutex from "epic-locks/build/mutex.js"
 import queryWeb from "./query.web.js"
 
 export default class VelociousDatabaseDriversSqliteConnectionSqlJs {
@@ -12,6 +13,9 @@ export default class VelociousDatabaseDriversSqliteConnectionSqlJs {
    */
   constructor(driver, connection, persistence) {
     this.connection = connection
+    this.databaseSaveDeferred = false
+    this.databaseSaveMutex = new Mutex()
+    this.databaseTransactionStarting = false
     this.driver = driver
     this.persistence = persistence
   }
@@ -30,6 +34,54 @@ export default class VelociousDatabaseDriversSqliteConnectionSqlJs {
     await this.saveDatabase()
   }
 
+  /**
+   * Flushes only when a mutation save is pending or was deferred by a transaction.
+   * @returns {Promise<void>} - Resolves when pending database bytes are stored.
+   */
+  async flushPendingDatabaseSave() {
+    if (!this.saveDatabaseDebounce.isPending && !this.databaseSaveDeferred) return
+
+    await this.flushDatabaseSave()
+  }
+
+  /**
+   * Drains active and queued persistence before atomically starting an outer transaction.
+   * @param {() => Promise<void>} callback - Starts the SQL transaction.
+   * @returns {Promise<void>} - Resolves after BEGIN succeeds.
+   */
+  async withTransactionStart(callback) {
+    if (this.saveDatabaseDebounce.isPending) {
+      this.saveDatabaseDebounce.clear()
+      this.databaseSaveDeferred = true
+    }
+
+    await this.databaseSaveMutex.sync(async () => {
+      if (this.databaseSaveDeferred) {
+        this.databaseSaveDeferred = false
+        const databaseContent = this.connection.export()
+
+        await this.persistence.save(databaseContent)
+      }
+
+      this.databaseTransactionStarting = true
+
+      try {
+        await callback()
+      } catch (error) {
+        this.databaseTransactionStarting = false
+        throw error
+      }
+    })
+  }
+
+  /**
+   * Marks successful outer transaction admission complete after driver state is updated.
+   * @returns {void}
+   */
+  completeTransactionStart() {
+    this.databaseTransactionStarting = false
+  }
+
   /**
    * Runs query.
    * @param {string} sql - SQL string.
@@ -59,9 +111,17 @@ export default class VelociousDatabaseDriversSqliteConnectionSqlJs {
   }
 
   saveDatabase = async () => {
-    const databaseContent = this.connection.export()
+    await this.databaseSaveMutex.sync(async () => {
+      if (this.driver.insideTransaction() || this.databaseTransactionStarting) {
+        this.databaseSaveDeferred = true
+        return
+      }
+
+      this.databaseSaveDeferred = false
+      const databaseContent = this.connection.export()
 
-    await this.persistence.save(databaseContent)
+      await this.persistence.save(databaseContent)
+    })
   }
 
   saveDatabaseDebounce = debounce(this.saveDatabase, 500)