fix: nullable columns aren't optional in select, rip

ProjectXero · Dec 10, 2022 · cc3408d · cc3408d
1 parent 1ccbcd5
commit cc3408d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 38 deletions.
diff --git a/src/generator/__tests__/__snapshots__/Generator.test.ts.snap b/src/generator/__tests__/__snapshots__/Generator.test.ts.snap
@@ -124,16 +124,16 @@ export const TableWithNullableFields$Metadata = {
     }
 } as const;
 export const TableWithNullableFields$SelectSchema = z.object({
-    nullable: z.string().nullish(),
-    nullable_with_default: z.string().nullish(),
-    nullable_array: z.array(z.string()).nullish(),
-    nullable_array_with_default: z.array(z.string()).nullish()
+    nullable: z.string().nullable(),
+    nullable_with_default: z.string().nullable(),
+    nullable_array: z.array(z.string()).nullable(),
+    nullable_array_with_default: z.array(z.string()).nullable()
 });
 export const TableWithNullableFields$InsertSchema = z.object({
-    nullable: z.string().nullish(),
-    nullable_with_default: z.string().nullish().or(z.literal(DEFAULT)),
-    nullable_array: z.array(z.string()).nullish(),
-    nullable_array_with_default: z.array(z.string()).nullish().or(z.literal(DEFAULT))
+    nullable: z.string().nullable().optional(),
+    nullable_with_default: z.string().nullable().optional().or(z.literal(DEFAULT)),
+    nullable_array: z.array(z.string()).nullable().optional(),
+    nullable_array_with_default: z.array(z.string()).nullable().optional().or(z.literal(DEFAULT))
 });
 export const TableWithJsonJsonb$Metadata = {
     json: {
@@ -147,11 +147,11 @@ export const TableWithJsonJsonb$Metadata = {
 } as const;
 export const TableWithJsonJsonb$SelectSchema = z.object({
     json: z.unknown(),
-    jsonb: z.unknown().nullish()
+    jsonb: z.unknown().nullable()
 });
 export const TableWithJsonJsonb$InsertSchema = z.object({
     json: z.unknown(),
-    jsonb: z.unknown().nullish().or(z.literal(DEFAULT))
+    jsonb: z.unknown().nullable().optional().or(z.literal(DEFAULT))
 });
 "
 `;
@@ -244,16 +244,16 @@ export const TableWithNullableFields$Metadata = {
     }
 } as const;
 export const TableWithNullableFields$SelectSchema = z.object({
-    nullable: z.string().nullish(),
-    nullableWithDefault: z.string().nullish(),
-    nullableArray: z.array(z.string()).nullish(),
-    nullableArrayWithDefault: z.array(z.string()).nullish()
+    nullable: z.string().nullable(),
+    nullableWithDefault: z.string().nullable(),
+    nullableArray: z.array(z.string()).nullable(),
+    nullableArrayWithDefault: z.array(z.string()).nullable()
 });
 export const TableWithNullableFields$InsertSchema = z.object({
-    nullable: z.string().nullish(),
-    nullableWithDefault: z.string().nullish().or(z.literal(DEFAULT)),
-    nullableArray: z.array(z.string()).nullish(),
-    nullableArrayWithDefault: z.array(z.string()).nullish().or(z.literal(DEFAULT))
+    nullable: z.string().nullable().optional(),
+    nullableWithDefault: z.string().nullable().optional().or(z.literal(DEFAULT)),
+    nullableArray: z.array(z.string()).nullable().optional(),
+    nullableArrayWithDefault: z.array(z.string()).nullable().optional().or(z.literal(DEFAULT))
 });
 export const TableWithJsonJsonb$Metadata = {
     json: {
@@ -267,11 +267,11 @@ export const TableWithJsonJsonb$Metadata = {
 } as const;
 export const TableWithJsonJsonb$SelectSchema = z.object({
     json: z.unknown(),
-    jsonb: z.unknown().nullish()
+    jsonb: z.unknown().nullable()
 });
 export const TableWithJsonJsonb$InsertSchema = z.object({
     json: z.unknown(),
-    jsonb: z.unknown().nullish().or(z.literal(DEFAULT))
+    jsonb: z.unknown().nullable().optional().or(z.literal(DEFAULT))
 });
 "
 `;

diff --git a/src/generator/__tests__/__snapshots__/integration.test.ts.snap b/src/generator/__tests__/__snapshots__/integration.test.ts.snap
@@ -55,10 +55,10 @@ export const TestTableOrder$Metadata = {
     }
 } as const;
 export const TestTableOrder$SelectSchema = z.object({
-    subsequent_table_type: z.lazy(() => TestTableStandard$SelectSchema.nullish())
+    subsequent_table_type: z.lazy(() => TestTableStandard$SelectSchema.nullable())
 });
 export const TestTableOrder$InsertSchema = z.object({
-    subsequent_table_type: z.lazy(() => TestTableStandard$InsertSchema.nullish())
+    subsequent_table_type: z.lazy(() => TestTableStandard$InsertSchema.nullable().optional())
 });
 export interface TestTableOrder {
     subsequent_table_type: TestTableStandard | null;
@@ -108,26 +108,26 @@ export const TestTableStandard$Metadata = {
     }
 } as const;
 export const TestTableStandard$SelectSchema = z.object({
-    arr_test: z.array(z.string()).nullish(),
-    caseTest_upper: z.string().nullish(),
-    casetest_lower: z.string().nullish(),
+    arr_test: z.array(z.string()).nullable(),
+    caseTest_upper: z.string().nullable(),
+    casetest_lower: z.string().nullable(),
     created_at: z.date(),
-    domain_test: z.string().nullish(),
-    enum_arr_test: z.lazy(() => z.array(z.nativeEnum(TestTypeEnum)).nullish()),
+    domain_test: z.string().nullable(),
+    enum_arr_test: z.lazy(() => z.array(z.nativeEnum(TestTypeEnum)).nullable()),
     enum_test: z.lazy(() => z.nativeEnum(TestTypeEnum)),
     id: z.number(),
-    jsonb_test: z.unknown().nullish()
+    jsonb_test: z.unknown().nullable()
 });
 export const TestTableStandard$InsertSchema = z.object({
-    arr_test: z.array(z.string()).nullish(),
-    caseTest_upper: z.string().nullish(),
-    casetest_lower: z.string().nullish(),
+    arr_test: z.array(z.string()).nullable().optional(),
+    caseTest_upper: z.string().nullable().optional(),
+    casetest_lower: z.string().nullable().optional(),
     created_at: z.date().optional().or(z.literal(DEFAULT)),
-    domain_test: z.string().nullish(),
-    enum_arr_test: z.lazy(() => z.array(z.nativeEnum(TestTypeEnum)).nullish()),
+    domain_test: z.string().nullable().optional(),
+    enum_arr_test: z.lazy(() => z.array(z.nativeEnum(TestTypeEnum)).nullable().optional()),
     enum_test: z.lazy(() => z.nativeEnum(TestTypeEnum)),
     id: z.number().optional().or(z.literal(DEFAULT)),
-    jsonb_test: z.unknown().nullish()
+    jsonb_test: z.unknown().nullable().optional()
 });
 export interface TestTableStandard<TJsonbTest = SerializableValueType> {
     arr_test: string[] | null;
@@ -179,12 +179,12 @@ export const TestTableTypes$Metadata = {
 export const TestTableTypes$SelectSchema = z.object({
     id: z.string(),
     table_arr_test: z.lazy(() => z.array(TestTableStandard$SelectSchema)),
-    table_test: z.lazy(() => TestTableStandard$SelectSchema.nullish())
+    table_test: z.lazy(() => TestTableStandard$SelectSchema.nullable())
 });
 export const TestTableTypes$InsertSchema = z.object({
     id: z.string(),
     table_arr_test: z.lazy(() => z.array(TestTableStandard$InsertSchema).optional().or(z.literal(DEFAULT))),
-    table_test: z.lazy(() => TestTableStandard$InsertSchema.nullish())
+    table_test: z.lazy(() => TestTableStandard$InsertSchema.nullable().optional())
 });
 export interface TestTableTypes {
     id: string;

diff --git a/src/generator/builders/InsertSchemaBuilder.ts b/src/generator/builders/InsertSchemaBuilder.ts
@@ -11,7 +11,7 @@ export default class InsertSchemaBuilder extends SelectSchemaBuilder {
     const [name, origValue, type] = super.buildSinglePropertyEntry(columnInfo)
     let value = origValue
 
-    if (columnInfo.hasDefault && !columnInfo.nullable) {
+    if (columnInfo.hasDefault || columnInfo.nullable) {
       value = factory.createCallExpression(
         factory.createPropertyAccessExpression(value, 'optional'),
         undefined,

diff --git a/src/generator/builders/SelectSchemaBuilder.ts b/src/generator/builders/SelectSchemaBuilder.ts
@@ -64,7 +64,7 @@ export default class SelectSchemaBuilder extends TypeBuilder<VariableStatement>
 
     if (columnInfo.nullable) {
       value = factory.createCallExpression(
-        factory.createPropertyAccessExpression(value, 'nullish'),
+        factory.createPropertyAccessExpression(value, 'nullable'),
         undefined,
         undefined
       )