@fragno-dev/db 0.2.2 → 0.4.1

package/src/adapters/generic-sql/migration/dialect/postgres.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it } from "vitest";
+
 import type { MigrationOperation } from "../../../../migration-engine/shared";
+import { createNamingResolver, type SqlNamingStrategy } from "../../../../naming/sql-naming";
+import { column, idColumn, schema } from "../../../../schema/create";
 import { createColdKysely } from "../cold-kysely";
 import { PostgresSQLGenerator } from "./postgres";
 
@@ -66,7 +69,7 @@ describe("PostgresSQLGenerator", () => {
         columns: [
           {
             name: "id",
-            type: "varchar(30)",
+            type: "varchar(128)",
             isNullable: false,
             role: "external-id",
             default: { runtime: "cuid" },
@@ -76,7 +79,7 @@ describe("PostgresSQLGenerator", () => {
 
       const sql = compileOne(operation);
       expect(sql).toMatchInlineSnapshot(
-        `"create table "users" ("id" varchar(30) not null unique)"`,
+        `"create table "users" ("id" varchar(128) not null unique)"`,
       );
     });
 
@@ -646,6 +649,7 @@ describe("PostgresSQLGenerator", () => {
         type: "drop-foreign-key",
         table: "posts",
         name: "posts_user_id_fk",
+        referencedTable: "users",
       };
 
       const sql = compileOne(operation);
@@ -890,10 +894,25 @@ describe("PostgresSQLGenerator", () => {
   });
 
   describe("table name mapping", () => {
-    const mapper = {
-      toPhysical: (name: string) => `prefix_${name}`,
-      toLogical: (name: string) => name.replace("prefix_", ""),
+    const mappingSchema = schema("mapping", (s) =>
+      s
+        .addTable("users", (t) =>
+          t.addColumn("id", idColumn()).addColumn("email", column("string")),
+        )
+        .addTable("posts", (t) =>
+          t.addColumn("id", idColumn()).addColumn("user_id", column("string")),
+        ),
+    );
+    const namingStrategy: SqlNamingStrategy = {
+      namespaceScope: "suffix",
+      namespaceToSchema: (namespace) => namespace,
+      tableName: (logicalTable) => `prefix_${logicalTable}`,
+      columnName: (logicalColumn) => logicalColumn,
+      indexName: (logicalIndex) => `idx_${logicalIndex}`,
+      uniqueIndexName: (logicalIndex) => `uidx_${logicalIndex}`,
+      foreignKeyName: ({ referenceName }) => referenceName,
     };
+    const resolver = createNamingResolver(mappingSchema, null, namingStrategy);
 
     it("should apply table name mapping to create-table", () => {
       const operation: MigrationOperation = {
@@ -902,7 +921,7 @@ describe("PostgresSQLGenerator", () => {
         columns: [{ name: "id", type: "integer", isNullable: false, role: "external-id" }],
       };
 
-      const statements = generator.compile([operation], mapper);
+      const statements = generator.compile([operation], resolver);
       expect(statements[0].sql).toMatchInlineSnapshot(
         `"create table "prefix_users" ("id" integer not null unique)"`,
       );
@@ -920,7 +939,7 @@ describe("PostgresSQLGenerator", () => {
         },
       };
 
-      const statements = generator.compile([operation], mapper);
+      const statements = generator.compile([operation], resolver);
       expect(statements[0].sql).toMatchInlineSnapshot(
         `"alter table "prefix_posts" add constraint "posts_user_id_fk" foreign key ("user_id") references "prefix_users" ("id") on delete restrict on update restrict"`,
       );
@@ -935,9 +954,9 @@ describe("PostgresSQLGenerator", () => {
         unique: true,
       };
 
-      const statements = generator.compile([operation], mapper);
+      const statements = generator.compile([operation], resolver);
       expect(statements[0].sql).toMatchInlineSnapshot(
-        `"create unique index "idx_email_prefix_users" on "prefix_users" ("email")"`,
+        `"create unique index "uidx_idx_email" on "prefix_users" ("email")"`,
       );
     });
   });

package/src/adapters/generic-sql/migration/dialect/postgres.ts

@@ -1,10 +1,12 @@
 import { type ColumnDefinitionBuilder, type CompiledQuery, type RawBuilder, sql } from "kysely";
+
 import type {
   ColumnInfo,
   ColumnOperation,
   MigrationOperation,
 } from "../../../../migration-engine/shared";
 import { isUpdated } from "../../../../migration-engine/shared";
+import type { NamingResolver } from "../../../../naming/sql-naming";
 import { SQLGenerator } from "../sql-generator";
 
 const errors = {
@@ -59,7 +61,9 @@ export class PostgresSQLGenerator extends SQLGenerator {
    */
   protected override compileUpdateColumn(
     tableName: string,
+    logicalTableName: string,
     operation: Extract<ColumnOperation, { type: "update-column" }>,
+    resolver?: NamingResolver,
   ): CompiledQuery | CompiledQuery[] {
     const col = operation.value;
 
@@ -72,13 +76,14 @@ export class PostgresSQLGenerator extends SQLGenerator {
     }
 
     const queries: CompiledQuery[] = [];
-    const alter = () => this.db.schema.alterTable(tableName);
+    const alter = () => this.getSchemaBuilder(resolver).alterTable(tableName);
+    const physicalColumnName = this.getColumnName(operation.name, logicalTableName, resolver);
 
     // PostgreSQL: Use explicit USING clause for type conversion
     if (operation.updateDataType) {
       const dbType = sql.raw(this.getDBType(col));
       queries.push(
-        sql`ALTER TABLE ${sql.ref(tableName)} ALTER COLUMN ${sql.ref(operation.name)} TYPE ${dbType} USING (${sql.ref(operation.name)}::${dbType})`.compile(
+        sql`ALTER TABLE ${sql.ref(tableName)} ALTER COLUMN ${sql.ref(physicalColumnName)} TYPE ${dbType} USING (${sql.ref(physicalColumnName)}::${dbType})`.compile(
           this.db,
         ),
       );
@@ -87,7 +92,7 @@ export class PostgresSQLGenerator extends SQLGenerator {
     if (operation.updateNullable) {
       queries.push(
         alter()
-          .alterColumn(operation.name, (build) =>
+          .alterColumn(physicalColumnName, (build) =>
             col.isNullable ? build.dropNotNull() : build.setNotNull(),
           )
           .compile(),
@@ -98,7 +103,7 @@ export class PostgresSQLGenerator extends SQLGenerator {
       const defaultValue = this.getDefaultValue(col);
       queries.push(
         alter()
-          .alterColumn(operation.name, (build) => {
+          .alterColumn(physicalColumnName, (build) => {
             if (!defaultValue) {
               return build.dropDefault();
             }