@sixb/sqlite 0.1.19 → 0.1.20

package/src/index.ts

@@ -41,11 +41,7 @@ import { SqliteConnectorConnectionStorage } from "./connector-connection-storage
 import { SqliteExecutionStorage } from "./execution-storage"
 import { SqliteFileDownloadGrantStorage } from "./file-download-grant-storage"
 import { SqliteFileUploadSessionStorage } from "./file-upload-session-storage"
-import {
-  createSqliteStorageMigrators,
-  installFreshSqliteSchema,
-  sqliteStoragePath,
-} from "./migrations"
+import { createSqliteStorageMigrators, sqliteStoragePath } from "./migrations"
 import { SqliteObjectStorage } from "./objects"
 import { SqliteOntologyStorage, type SqliteOntologyTransactionContext } from "./ontology-storage"
 import { SqlitePipelineRunStorage } from "./pipeline-run-storage"
@@ -127,10 +123,6 @@ export class SqliteStorage implements MigrationCapableStorage {
       this.readConnection = this.connection
     }
 
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.connection.db)
-    }
-
     const stores = createSqliteStores(this.connection, {
       runOntologyOperation: async (run) => run(),
       transactionContext: null,
@@ -256,7 +248,6 @@ export class SqliteStorage implements MigrationCapableStorage {
         {
           db: this.connection.db,
           ownsConnection: false,
-          installFreshSchema: false,
         },
         {
           runOntologyOperation: async (run) => run(),

package/src/migrations/061-drop-auth-audience.sql

@@ -0,0 +1,16 @@
+-- A project has one browser app, so sessions, magic links and sign-in attempts no longer name the
+-- one they belong to. Atlas's browser sessions end here: their cookie is no longer read. Native
+-- sessions carried Atlas's name only because the column needed a value, so they stay.
+UPDATE auth_sessions
+SET revoked_at = strftime('%Y-%m-%dT%H:%M:%fZ', 'now')
+WHERE audience = 'atlas'
+  AND refresh_token_hash IS NULL
+  AND revoked_at IS NULL;
+
+DROP INDEX idx_auth_sessions_user_active;
+ALTER TABLE auth_sessions DROP COLUMN audience;
+CREATE INDEX idx_auth_sessions_user_active
+  ON auth_sessions(project_id, user_id, revoked_at, expires_at);
+
+ALTER TABLE auth_magic_links DROP COLUMN audience;
+ALTER TABLE auth_oidc_authorization_attempts DROP COLUMN audience;

package/src/migrations.ts

@@ -272,6 +272,7 @@ export const sqliteStorageMigrations = defineMigrations({
     sqliteSql("058-file-download-grants", fileDownloadGrantsSql),
     sqliteSql("059-drained-source-versions", drainedSourceVersionsSql),
     sqliteSql("060-terminal-action-runs", terminalActionRunsSql),
+    sqliteSql("061-drop-auth-audience", dropAuthAudienceSql),
   ],
 })
 
@@ -297,6 +298,26 @@ export function sqliteStep(
   return step<Database>(id, up, options)
 }
 
+// Replaying every migration costs a few hundred milliseconds, and in-memory databases are made
+// often (each test's storage, for one). The schema is built once per process and each new database
+// starts as a copy of it.
+let freshSchema: Uint8Array | undefined
+
+/** A new in-memory database holding the current schema, as replaying every migration leaves it. */
+export function freshSqliteDatabase(): Database {
+  if (!freshSchema) {
+    const template = new Database(":memory:")
+    try {
+      template.run("PRAGMA foreign_keys = ON")
+      installFreshSqliteSchema(template)
+      freshSchema = template.serialize()
+    } finally {
+      template.close()
+    }
+  }
+  return Database.deserialize(freshSchema)
+}
+
 export function installFreshSqliteSchema(db: Database): void {
   for (const migration of sqliteStorageMigrations.steps) {
     const installed = migration.up(db)
@@ -599,3 +620,4 @@ import drainedSourceVersionsSql from "./migrations/059-drained-source-versions.s
   type: "text",
 }
 import terminalActionRunsSql from "./migrations/060-terminal-action-runs.sql" with { type: "text" }
+import dropAuthAudienceSql from "./migrations/061-drop-auth-audience.sql" with { type: "text" }

package/src/objects/storage.ts

@@ -22,7 +22,6 @@ import type {
   QueryObjectsInput,
   QueryObjectsResult,
 } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "../migrations"
 import {
   closeSqliteStoreConnection,
   openSqliteStoreConnection,
@@ -124,10 +123,6 @@ export class SqliteObjectStorage implements ObjectStorage {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
     this.reader = new SqliteObjectReader(this.db, DEFAULT_OBJECT_QUERY_SOURCE)
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   queryCapabilities(): ObjectQueryCapabilities {

package/src/pipeline-run-storage.ts

@@ -22,7 +22,6 @@ import type {
 } from "@sixb/core/storage"
 import { PIPELINE_RUN_FAILURE_CODES, PipelineRunError } from "@sixb/core/storage"
 import { queryLatestRunsByOwnerId } from "./latest-run-query"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   appendRunListFilters,
   hasEmptyStatuses,
@@ -54,10 +53,6 @@ export class SqlitePipelineRunStorage implements PipelineRunStorage {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
     this.executions = options.executions
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   async queue(input: QueuePipelineRunInput): Promise<PipelineRunRecord> {

package/src/projection-run-storage.ts

@@ -56,7 +56,6 @@ import type {
 } from "@sixb/core/storage"
 import { PROJECTION_RUN_FAILURE_CODES, ProjectionRunError } from "@sixb/core/storage"
 import { queryLatestRunsByOwnerId } from "./latest-run-query"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   closeSqliteStoreConnection,
   openSqliteStoreConnection,
@@ -82,10 +81,6 @@ export class SqliteProjectionRunStorage implements ProjectionRunStorage {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
     this.executions = options.executions
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   async queue(input: QueueProjectionRunInput): Promise<ProjectionRunRecord> {

package/src/rules-storage.ts

@@ -11,7 +11,6 @@ import type {
   StoredRuleResolvedEvent,
   StoredRuleTriggeredEvent,
 } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   closeSqliteStoreConnection,
   openSqliteStoreConnection,
@@ -33,10 +32,6 @@ export class SqliteRulesStorage implements RulesStorage {
   constructor(options: SqliteRulesStorageOptions = {}) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   async getActive(params: {

package/src/share-grant-storage.ts

@@ -16,7 +16,6 @@ import type {
   ShareGrantStorage,
 } from "@sixb/core/storage"
 import { ShareGrantStorageError } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "./migrations"
 import { isUniqueConstraintError } from "./storage-errors"
 import {
   closeSqliteStoreConnection,
@@ -37,7 +36,6 @@ export class SqliteShareGrantStorage implements ShareGrantStorage {
   constructor(options: SqliteShareGrantStorageOptions = {}) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
-    if (this.connection.installFreshSchema) installFreshSqliteSchema(this.db)
   }
 
   async create(input: CreateShareGrantInput): Promise<ShareGrantRecord> {

package/src/share-session-storage.ts

@@ -15,7 +15,6 @@ import type {
   ShareSessionStorage,
 } from "@sixb/core/storage"
 import { ShareSessionStorageError } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "./migrations"
 import { isForeignKeyConstraintError, isUniqueConstraintError } from "./storage-errors"
 import {
   closeSqliteStoreConnection,
@@ -36,7 +35,6 @@ export class SqliteShareSessionStorage implements ShareSessionStorage {
   constructor(options: SqliteShareSessionStorageOptions = {}) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
-    if (this.connection.installFreshSchema) installFreshSqliteSchema(this.db)
   }
 
   async create(input: CreateShareSessionInput): Promise<ShareSessionRecord> {

package/src/sync-run-storage.ts

@@ -17,7 +17,6 @@ import type {
 } from "@sixb/core/storage"
 import { SYNC_RUN_FAILURE_CODES, SyncRunError } from "@sixb/core/storage"
 import { queryLatestRunsByOwnerId } from "./latest-run-query"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   appendRunListFilters,
   hasEmptyStatuses,
@@ -48,10 +47,6 @@ export class SqliteSyncRunStorage implements SyncRunStorage {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
     this.executions = options.executions
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   async queue(input: QueueSyncRunInput): Promise<SyncRunRecord> {

package/src/timeseries-storage.ts

@@ -5,7 +5,6 @@ import type {
   TimeseriesPoint,
   TimeseriesStorage,
 } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   closeSqliteStoreConnection,
   openSqliteStoreConnection,
@@ -31,10 +30,6 @@ export class SqliteTimeseriesStorage implements TimeseriesStorage {
   constructor(options: SqliteTimeseriesStorageOptions = {}) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   async getHistory(params: {

package/src/transactions.ts

@@ -2,11 +2,11 @@ import type { Database } from "bun:sqlite"
 import { Database as SqliteDatabase } from "bun:sqlite"
 import { mkdirSync } from "node:fs"
 import { dirname } from "node:path"
+import { freshSqliteDatabase } from "./migrations"
 
 export interface SqliteStoreConnection {
   readonly db: Database
   readonly ownsConnection: boolean
-  readonly installFreshSchema: boolean
 }
 
 export interface SqliteStoreConnectionOptions {
@@ -22,20 +22,20 @@ export function openSqliteStoreConnection(
     return {
       db: options.connection.db,
       ownsConnection: false,
-      installFreshSchema: false,
     }
   }
 
   const path = options.path ?? ":memory:"
   if (path !== ":memory:" && !options.readonly) mkdirSync(dirname(path), { recursive: true })
-  const db = new SqliteDatabase(path, options.readonly ? { readonly: true } : undefined)
+  // A file is brought up to date by its migrators; a writable in-memory database starts with the
+  // whole schema.
+  const db =
+    path === ":memory:" && !options.readonly
+      ? freshSqliteDatabase()
+      : new SqliteDatabase(path, options.readonly ? { readonly: true } : undefined)
   db.run("PRAGMA foreign_keys = ON")
   db.run("PRAGMA busy_timeout = 5000")
-  return {
-    db,
-    ownsConnection: true,
-    installFreshSchema: path === ":memory:" && !options.readonly,
-  }
+  return { db, ownsConnection: true }
 }
 
 export function closeSqliteStoreConnection(connection: SqliteStoreConnection): void {

package/src/webhook-run-storage.ts

@@ -13,7 +13,6 @@ import type {
   WebhookRunStorage,
 } from "@sixb/core/storage"
 import { canRetryWebhookRun, WEBHOOK_RUN_FAILURE_CODES, WebhookRunError } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   appendRunListFilters,
   hasEmptyStatuses,
@@ -45,8 +44,6 @@ export class SqliteWebhookRunStorage implements WebhookRunStorage {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
     this.executions = options.executions
-
-    if (this.connection.installFreshSchema) installFreshSqliteSchema(this.db)
   }
 
   async start(input: StartWebhookRunInput): Promise<WebhookRunRecord> {

package/src/workflow-intervention-storage.ts

@@ -12,7 +12,6 @@ import type {
   WorkflowInterventionStorage,
 } from "@sixb/core/storage"
 import { WorkflowInterventionError } from "@sixb/core/storage"
-import { installFreshSqliteSchema } from "./migrations"
 import { isUniqueConstraintError } from "./storage-errors"
 import {
   closeSqliteStoreConnection,
@@ -34,10 +33,6 @@ export class SqliteWorkflowInterventionStorage implements WorkflowInterventionSt
   constructor(options: SqliteWorkflowInterventionStorageOptions = {}) {
     this.connection = openSqliteStoreConnection(options)
     this.db = this.connection.db
-
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
   }
 
   async create(input: CreateWorkflowInterventionInput): Promise<WorkflowInterventionRecord> {

package/src/workflow-run-storage.ts

@@ -44,7 +44,6 @@ import {
   WorkflowRunError,
 } from "@sixb/core/storage"
 import { queryLatestRunsByOwnerId } from "./latest-run-query"
-import { installFreshSqliteSchema } from "./migrations"
 import {
   appendRunListFilters,
   hasEmptyStatuses,
@@ -80,10 +79,6 @@ export class SqliteWorkflowRunStorage implements WorkflowRunStorage {
     this.db = this.connection.db
     this.executions = options.executions
 
-    if (this.connection.installFreshSchema) {
-      installFreshSqliteSchema(this.db)
-    }
-
     this.nodes = new SqliteWorkflowNodeRunStorage(this.db)
     this.agentNodes = new SqliteWorkflowAgentNodeRunStorage(this.db, this.executions)
   }