fix: fix column type that has defaultTo

subframe7536 · Jan 30, 2025 · 97a03da · 97a03da
1 parent 89f68dd
commit 97a03da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/schema/define.ts b/src/schema/define.ts
@@ -183,5 +183,5 @@ export const column = {
    */
   object: <T extends object, DefaultTo extends T | RawBuilder<unknown> | null, NotNull extends boolean | null>(
     options?: Options<T, DefaultTo, NotNull>,
-  ) => parse(DataType.object, options as any) as ColumnBuilder<TDataType['object'], T, NotNull>,
+  ) => parse(DataType.object, options as any) as ColumnBuilder<TDataType['object'], DefaultTo, NotNull>,
 }
diff --git a/src/schema/types.ts b/src/schema/types.ts
@@ -190,12 +190,8 @@ export type InferTable<
       : P[K]['type'] extends TDataType['increments']
         // return "Generated<...>"
         ? Exclude<P[K]['defaultTo'], null>
-        // if defaultTo is not null
-        : IsNotNull<P[K]['defaultTo']> extends true
-          // return Generated
-          ? Generated<Exclude<P[K]['defaultTo'], null>>
-          // return optional
-          : P[K]['defaultTo'] | null
+        // return defaultTo
+        : P[K]['defaultTo'] | null
     // return error info
     : `TypeError: [defaultTo] is not satisfied [type] in column "${K & string}"`
 }>