fix: correctly type expression generated columns

ProjectXero · Dec 10, 2022 · da792a1 · da792a1
1 parent 073cfad
commit da792a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/generator/__tests__/__snapshots__/integration.test.ts.snap b/src/generator/__tests__/__snapshots__/integration.test.ts.snap
@@ -32,15 +32,15 @@ export const TestGenerationDefaults$SelectSchema = z.object({
     generated_id: z.number()
 });
 export const TestGenerationDefaults$InsertSchema = z.object({
-    generated_column: z.number(),
+    generated_column: z.number().optional().or(z.literal(DEFAULT)),
     generated_id: z.number().optional().or(z.literal(DEFAULT))
 });
 export interface TestGenerationDefaults {
     generated_column: number;
     generated_id: number;
 }
 export interface TestGenerationDefaults$Insert {
-    generated_column: number;
+    generated_column?: number;
     generated_id?: number;
 }
 export const TestGenerationDefaults$Types = {

diff --git a/src/generator/database/SchemaInfo.ts b/src/generator/database/SchemaInfo.ts
@@ -49,7 +49,8 @@ export default class SchemaInfo {
            , (c.is_nullable = 'YES') AS "nullable"
            , (
               c.column_default IS NOT NULL OR
-              c.identity_generation IS NOT NULL
+              c.identity_generation IS NOT NULL OR
+              c.is_generated != 'NEVER'
              ) AS "hasDefault"
            , c.ordinal_position AS "order"
            , COALESCE(