@fragno-dev/db 0.1.1 → 0.1.2

package/src/adapters/kysely/migration/execute-postgres.test.ts

@@ -73,7 +73,7 @@ describe("execute() - PostgreSQL", () => {
             type: "varchar(30)",
             isNullable: false,
             role: "external-id",
-            default: { value: undefined, runtime: "auto" },
+            default: { runtime: "cuid" },
           },
         ],
       };
@@ -195,7 +195,7 @@ describe("execute() - PostgreSQL", () => {
             type: "timestamp",
             isNullable: false,
             role: "regular",
-            default: { runtime: "now" },
+            default: { dbSpecial: "now" },
           },
         ],
       };
@@ -710,7 +710,7 @@ describe("execute() - PostgreSQL", () => {
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
             updateDataType: false,
             updateNullable: false,
@@ -1215,7 +1215,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "name",
@@ -1247,7 +1247,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "title",
@@ -1368,7 +1368,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "email",
@@ -1399,7 +1399,7 @@ describe("execute() - PostgreSQL", () => {
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
           ],
         },
@@ -1425,7 +1425,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "name",
@@ -1483,7 +1483,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "customerId",
@@ -1509,7 +1509,7 @@ describe("execute() - PostgreSQL", () => {
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
           ],
         },
@@ -1535,7 +1535,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "orderId",
@@ -1693,7 +1693,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "username",
@@ -1878,7 +1878,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "name",
@@ -1916,14 +1916,14 @@ describe("execute() - PostgreSQL", () => {
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
             {
               name: "updatedAt",
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
           ],
         },
@@ -1949,7 +1949,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "title",
@@ -2012,14 +2012,14 @@ describe("execute() - PostgreSQL", () => {
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
             {
               name: "updatedAt",
               type: "timestamp",
               isNullable: false,
               role: "regular",
-              default: { runtime: "now" },
+              default: { dbSpecial: "now" },
             },
           ],
         },
@@ -2045,7 +2045,7 @@ describe("execute() - PostgreSQL", () => {
               type: "integer",
               isNullable: false,
               role: "external-id",
-              default: { runtime: "auto" },
+              default: { runtime: "cuid" },
             },
             {
               name: "name",

package/src/adapters/kysely/migration/execute.ts

@@ -16,14 +16,15 @@ import {
 import type { SQLProvider } from "../../../shared/providers";
 import { schemaToDBType } from "../../../schema/serialize";
 import type { KyselyConfig } from "../kysely-adapter";
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type KyselyAny = Kysely<any>;
+import type { TableNameMapper } from "../kysely-shared";
+import { SETTINGS_TABLE_NAME } from "../../../shared/settings-schema";
 
 export type ExecuteNode = Compilable & {
   execute(): Promise<unknown>;
 };
 
+type KyselyAny = Kysely<any>; // eslint-disable-line @typescript-eslint/no-explicit-any
+
 const errors = {
   IdColumnUpdate:
     "ID columns cannot be updated. Not every database supports updating primary keys and often requires workarounds.",
@@ -204,11 +205,23 @@ export function execute(
   operation: MigrationOperation,
   config: KyselyConfig,
   onCustomNode: (op: CustomOperation) => ExecuteNode | ExecuteNode[],
+  mapper?: TableNameMapper,
 ): ExecuteNode | ExecuteNode[] {
   const { db, provider } = config;
 
+  // Settings table is never namespaced
+  const getTableName = (tableName: string) =>
+    tableName === SETTINGS_TABLE_NAME
+      ? tableName
+      : mapper
+        ? mapper.toPhysical(tableName)
+        : tableName;
+
   function createTable(tableName: string, columns: ColumnInfo[]) {
-    let builder = db.schema.createTable(tableName) as CreateTableBuilder<string, string>;
+    let builder = db.schema.createTable(getTableName(tableName)) as CreateTableBuilder<
+      string,
+      string
+    >;
 
     // Add columns from the column info array
     for (const columnInfo of columns) {
@@ -229,22 +242,24 @@ export function execute(
       if (provider === "mssql") {
         return rawToNode(
           db,
-          sql`EXEC sp_rename ${sql.lit(operation.from)}, ${sql.lit(operation.to)}`,
+          sql`EXEC sp_rename ${sql.lit(getTableName(operation.from))}, ${sql.lit(getTableName(operation.to))}`,
         );
       }
 
-      return db.schema.alterTable(operation.from).renameTo(operation.to);
+      return db.schema
+        .alterTable(getTableName(operation.from))
+        .renameTo(getTableName(operation.to));
     case "alter-table": {
       const results: ExecuteNode[] = [];
 
       for (const op of operation.value) {
-        results.push(...executeColumn(operation.name, op, config));
+        results.push(...executeColumn(getTableName(operation.name), op, config));
       }
 
       return results;
     }
     case "drop-table":
-      return db.schema.dropTable(operation.name);
+      return db.schema.dropTable(getTableName(operation.name));
     case "custom":
       return onCustomNode(operation);
     case "add-foreign-key": {
@@ -256,11 +271,11 @@ export function execute(
       const action = getForeignKeyAction(provider);
 
       return db.schema
-        .alterTable(table)
+        .alterTable(getTableName(table))
         .addForeignKeyConstraint(
           value.name,
           value.columns,
-          value.referencedTable,
+          getTableName(value.referencedTable),
           value.referencedColumns,
           (b) => b.onUpdate(action).onDelete(action),
         );
@@ -271,7 +286,7 @@ export function execute(
       }
 
       const { table, name } = operation;
-      let query = db.schema.alterTable(table).dropConstraint(name);
+      let query = db.schema.alterTable(getTableName(table)).dropConstraint(name);
 
       // MySQL doesn't support IF EXISTS for dropping constraints
       if (provider !== "mysql") {
@@ -282,12 +297,21 @@ export function execute(
     }
     case "add-index": {
       if (operation.unique) {
-        return createUniqueIndex(db, operation.name, operation.table, operation.columns, provider);
+        return createUniqueIndex(
+          db,
+          operation.name,
+          getTableName(operation.table),
+          operation.columns,
+          provider,
+        );
       }
-      return db.schema.createIndex(operation.name).on(operation.table).columns(operation.columns);
+      return db.schema
+        .createIndex(operation.name)
+        .on(getTableName(operation.table))
+        .columns(operation.columns);
     }
     case "drop-index": {
-      return dropUniqueIndex(db, operation.name, operation.table, provider);
+      return dropUniqueIndex(db, operation.name, getTableName(operation.table), provider);
     }
   }
 }
@@ -370,12 +394,19 @@ function defaultValueToDB(column: ColumnInfo, provider: SQLProvider) {
     return undefined;
   }
 
-  if ("runtime" in value && value.runtime === "now") {
+  // Static default values: defaultTo(value)
+  if ("value" in value && value.value !== undefined) {
+    return sql.lit(value.value);
+  }
+
+  // Database-level special functions: defaultTo(b => b.now())
+  if ("dbSpecial" in value && value.dbSpecial === "now") {
     return sql`CURRENT_TIMESTAMP`;
   }
 
-  if ("value" in value && value.value !== undefined) {
-    return sql.lit(value.value);
+  // Runtime defaults (defaultTo$) are NOT generated in SQL - they're handled in application code
+  if ("runtime" in value) {
+    return undefined;
   }
 
   return undefined;

package/src/adapters/kysely/migration/kysely-migrator.test.ts

@@ -50,11 +50,9 @@ describe("KyselyMigrator", () => {
     const sql = preparedMigration.getSQL?.();
     expect(sql).toBeDefined();
     expect(sql).toMatchInlineSnapshot(`
-      "create table "fragno_db_settings" ("key" varchar(255) primary key, "value" text not null);
+      "create table "users_test_namespace" ("id" varchar(30) not null unique, "name" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
 
-      insert into "fragno_db_settings" ("key", "value") values ('test_namespace.schema_version', '1');
-
-      create table "users" ("id" varchar(30) not null unique, "name" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);"
+      insert into "fragno_db_settings" ("id", "key", "value") values ('jprP_43K5uMwxAFiepbbrQ', 'test_namespace.schema_version', '1');"
     `);
   });
 
@@ -69,17 +67,15 @@ describe("KyselyMigrator", () => {
     const sql = preparedMigration.getSQL?.();
     expect(sql).toBeDefined();
     expect(sql).toMatchInlineSnapshot(`
-      "create table "fragno_db_settings" ("key" varchar(255) primary key, "value" text not null);
-
-      insert into "fragno_db_settings" ("key", "value") values ('test_namespace.schema_version', '2');
+      "create table "users_test_namespace" ("id" varchar(30) not null unique, "name" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
 
-      create table "users" ("id" varchar(30) not null unique, "name" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
+      alter table "users_test_namespace" add column "age" integer;
 
-      alter table "users" add column "age" integer;
+      create index "name_idx" on "users_test_namespace" ("name");
 
-      create index "name_idx" on "users" ("name");
+      create index "age_idx" on "users_test_namespace" ("age");
 
-      create index "age_idx" on "users" ("age");"
+      insert into "fragno_db_settings" ("id", "key", "value") values ('jprP_43K5uMwxAFiepbbrQ', 'test_namespace.schema_version', '2');"
     `);
   });
 
@@ -94,13 +90,13 @@ describe("KyselyMigrator", () => {
     const sql = preparedMigration.getSQL?.();
     expect(sql).toBeDefined();
     expect(sql).toMatchInlineSnapshot(`
-      "update "fragno_db_settings" set "value" = '2' where "key" = 'test_namespace.schema_version';
+      "alter table "users_test_namespace" add column "age" integer;
 
-      alter table "users" add column "age" integer;
+      create index "name_idx" on "users_test_namespace" ("name");
 
-      create index "name_idx" on "users" ("name");
+      create index "age_idx" on "users_test_namespace" ("age");
 
-      create index "age_idx" on "users" ("age");"
+      update "fragno_db_settings" set "value" = '2' where "key" = 'test_namespace.schema_version';"
     `);
   });
 
@@ -115,19 +111,17 @@ describe("KyselyMigrator", () => {
     const sql = preparedMigration.getSQL?.();
     expect(sql).toBeDefined();
     expect(sql).toMatchInlineSnapshot(`
-      "create table "fragno_db_settings" ("key" varchar(255) primary key, "value" text not null);
+      "create table "users_test_namespace" ("id" varchar(30) not null unique, "name" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
 
-      insert into "fragno_db_settings" ("key", "value") values ('test_namespace.schema_version', '3');
+      alter table "users_test_namespace" add column "age" integer;
 
-      create table "users" ("id" varchar(30) not null unique, "name" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
+      create index "name_idx" on "users_test_namespace" ("name");
 
-      alter table "users" add column "age" integer;
+      create index "age_idx" on "users_test_namespace" ("age");
 
-      create index "name_idx" on "users" ("name");
+      create table "posts_test_namespace" ("id" varchar(30) not null unique, "title" text not null, "user_id" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
 
-      create index "age_idx" on "users" ("age");
-
-      create table "posts" ("id" varchar(30) not null unique, "title" text not null, "user_id" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);"
+      insert into "fragno_db_settings" ("id", "key", "value") values ('jprP_43K5uMwxAFiepbbrQ', 'test_namespace.schema_version', '3');"
     `);
   });
 
@@ -142,9 +136,9 @@ describe("KyselyMigrator", () => {
     const sql = preparedMigration.getSQL?.();
     expect(sql).toBeDefined();
     expect(sql).toMatchInlineSnapshot(`
-      "update "fragno_db_settings" set "value" = '3' where "key" = 'test_namespace.schema_version';
+      "create table "posts_test_namespace" ("id" varchar(30) not null unique, "title" text not null, "user_id" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);
 
-      create table "posts" ("id" varchar(30) not null unique, "title" text not null, "user_id" text not null, "_internalId" bigserial not null primary key, "_version" integer default 0 not null);"
+      update "fragno_db_settings" set "value" = '3' where "key" = 'test_namespace.schema_version';"
     `);
   });
 
@@ -182,16 +176,4 @@ describe("KyselyMigrator", () => {
       }),
     ).rejects.toThrow("schema only has version 4");
   });
-
-  test("getDefaultFileName returns correct format", () => {
-    const migrator = adapter.createMigrationEngine(testSchema, "test_namespace");
-
-    expect(migrator.getDefaultFileName).toBeDefined();
-
-    if (migrator.getDefaultFileName) {
-      const filename = migrator.getDefaultFileName("my-fragment", 0, 1);
-      // Should match format: YYYYMMDD_namespace_migration_0_to_1.sql
-      expect(filename).toMatch(/^\d{8}_my-fragment_migration_0_to_1\.sql$/);
-    }
-  });
 });

package/src/fragment.test.ts

@@ -21,6 +21,7 @@ const mockDatabaseAdapter: DatabaseAdapter = {
   createSchemaGenerator: () => {
     throw new Error("Not implemented");
   },
+  isConnectionHealthy: () => Promise.resolve(true),
 };
 
 describe("DatabaseFragmentBuilder", () => {

package/src/migration-engine/auto-from-schema.ts

@@ -71,15 +71,13 @@ export function generateMigrationFromSchema(
             isNullable: col.isNullable,
             role: col.role,
             default: col.default
-              ? {
-                  value: "value" in col.default ? col.default.value : undefined,
-                  runtime:
-                    "runtime" in col.default
-                      ? typeof col.default.runtime === "string"
-                        ? col.default.runtime
-                        : undefined
-                      : undefined,
-                }
+              ? "value" in col.default
+                ? { value: col.default.value }
+                : "dbSpecial" in col.default
+                  ? { dbSpecial: col.default.dbSpecial }
+                  : "runtime" in col.default && typeof col.default.runtime === "string"
+                    ? { runtime: col.default.runtime }
+                    : undefined
               : undefined,
           });
         }
@@ -131,15 +129,13 @@ export function generateMigrationFromSchema(
                 isNullable: col.isNullable,
                 role: col.role,
                 default: col.default
-                  ? {
-                      value: "value" in col.default ? col.default.value : undefined,
-                      runtime:
-                        "runtime" in col.default
-                          ? typeof col.default.runtime === "string"
-                            ? col.default.runtime
-                            : undefined
-                          : undefined,
-                    }
+                  ? "value" in col.default
+                    ? { value: col.default.value }
+                    : "dbSpecial" in col.default
+                      ? { dbSpecial: col.default.dbSpecial }
+                      : "runtime" in col.default && typeof col.default.runtime === "string"
+                        ? { runtime: col.default.runtime }
+                        : undefined
                   : undefined,
               },
             };

package/src/migration-engine/create.ts

@@ -44,11 +44,6 @@ export interface Migrator {
     toVersion: number,
     options?: MigrateOptions & { fromVersion?: number },
   ) => Promise<PreparedMigration>;
-
-  /**
-   * Get default file name for migration SQL
-   */
-  getDefaultFileName?: (namespace: string, fromVersion: number, toVersion: number) => string;
 }
 
 export interface MigrationEngineOptions {
@@ -186,8 +181,8 @@ export function createMigrator({
 
       let operations = updateVersion
         ? [
-            ...(await settings.updateSettingsInMigration(fromVersion, toVersion)),
             ...(await context.auto()),
+            ...(await settings.updateSettingsInMigration(fromVersion, toVersion)),
           ]
         : await context.auto();