Don't assume non nullability on pk

Signed-off-by: Alexis Rico <[email protected]>
xataio · Sep 26, 2024 · 65bd0cb · 65bd0cb
1 parent d1222dc
commit 65bd0cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/client/src/schema/identifiable.spec.ts b/packages/client/src/schema/identifiable.spec.ts
@@ -11,7 +11,7 @@ const tables = [
     ]
   },
   {
-    name: 'InvalidPrimaryKey',
+    name: 'NullablePrimaryKey',
     primaryKey: ['pk'],
     columns: [
       { name: 'pk', type: 'int', notNull: false, unique: true },
@@ -62,10 +62,9 @@ test('PrimaryKey', () => {
   const user3: Type = { pk: 1, xata_version: 1 };
 });
 
-test('InvalidPrimaryKey', () => {
-  type Type = NewIdentifiable<typeof tables>['InvalidPrimaryKey'];
+test('NullablePrimaryKey', () => {
+  type Type = NewIdentifiable<typeof tables>['NullablePrimaryKey'];
 
-  // @ts-expect-error
   const user: Type = { pk: 1 };
   // @ts-expect-error
   const user2: Type = { pk: '1' };

diff --git a/packages/client/src/schema/identifiable.ts b/packages/client/src/schema/identifiable.ts
@@ -63,7 +63,9 @@ type PropertyType<Properties, PropertyName extends PropertyKey> = Properties & {
       ? {
           [K in PropertyName]: InnerType<Type>;
         }
-      : never
+      : {
+          [K in PropertyName]: InnerType<Type> | null;
+        }
     : never
   : never;
-Original file line number
+Diff line change
@@ Expand Up @@
           ? {
               [K in PropertyName]: InnerType<Type>;
             }
-          : never
+          : {
+              [K in PropertyName]: InnerType<Type> | null;
+            }
         : never
       : never;
@@ Expand Down @@