fix: prioritize type overrides over column overrides correctly (#423)

* fix: prioritize type overrides over column overrides correctly

Fix the logic for resolving custom type overrides to ensure that type overrides are applied correctly even when column overrides exist for unrelated columns. Previously, the code returned early when a column override was found, ignoring type overrides that should apply to the column's type. This caused incorrect early exit and improper type resolution. The fix changes the order of checks to first look for a column override for the specific column, and if none is found, then apply the type override for the column's type. Added a test to verify that type overrides are respected even when unrelated column overrides exist.

* format

* fix

Author: Newbie012

.changeset/proud-ads-poke.md

@@ -0,0 +1,5 @@
+---
+"@ts-safeql/generate": patch
+---
+
+fixed an issue where custom type was inferred incorrectly in conjunction with custom columns

packages/generate/src/generate-insert.test.ts

@@ -472,4 +472,25 @@ describe("INSERT validation", () => {
       `,
     });
   });
+
+  test("INSERT with type override in conjunction with unrelated column override should use custom type", async () => {
+    await testQuery({
+      options: {
+        overrides: {
+          types: { timestamptz: "Instant" },
+          columns: { "tbl2.col": "CustomType" },
+        },
+      },
+      schema: `
+        CREATE TABLE IF NOT EXISTS tbl (
+          col TIMESTAMPTZ NOT NULL
+        );
+      `,
+      query: `
+        INSERT INTO tbl (col) VALUES (NOW()) RETURNING *
+      `,
+      expected: [["col", { kind: "type", value: "Instant", type: "timestamptz" }]],
+      unknownColumns: ["col"],
+    });
+  });
 });

packages/generate/src/generate.ts

@@ -479,36 +479,25 @@ function getResolvedTargetEntry(params: {
 
     if (!pgType) return undefined;
 
-    if (params.context.overrides?.columns && params.context.overrides.columns.size > 0) {
-      const override = params.context.overrides.columns
-        .get(params.col.introspected?.tableName ?? "")
-        ?.get(params.col.described.name);
-
-      return fmap(
-        override,
-        (value): ResolvedTarget => ({ kind: "type", value, type: pgType.name }),
-      );
-    }
+    const columnOverride = params?.context?.overrides?.columns
+      .get(params.col.introspected?.tableName ?? "")
+      ?.get(params.col.described.name);
 
-    if (params.context.overrides?.types) {
-      const override = params.context.overrides.types.get(pgType.name);
-
-      return fmap(
-        override,
-        ({ value }): ResolvedTarget => ({ kind: "type", value, type: pgType.name }),
-      );
+    if (columnOverride !== undefined) {
+      return { kind: "type", value: columnOverride, type: pgType.name } satisfies ResolvedTarget;
     }
 
-    if (params.context.overrides?.types === undefined || pgType === undefined) {
-      return undefined;
-    }
+    const typeOverride = params?.context?.overrides?.types.get(pgType.name);
 
-    const override = params.context.overrides.types.get(pgType.name);
+    if (typeOverride !== undefined) {
+      return {
+        kind: "type",
+        value: typeOverride.value,
+        type: pgType.name,
+      } satisfies ResolvedTarget;
+    }
 
-    return fmap(
-      override,
-      ({ value }): ResolvedTarget => ({ kind: "type", value, type: pgType.name }),
-    );
+    return undefined;
   })();
 
   const value = valueAsOverride ?? valueAsEnum ?? valueAsType;