pqb 0.2.3 → 0.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pqb",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Postgres query builder",
   "homepage": "https://porm.netlify.app/guide/query-builder.html",
   "repository": {

package/src/adapter.test.ts

@@ -1,10 +1,10 @@
 import { adapter } from './test-utils';
 
 describe('adapter', () => {
-  it('should run query and close connection by calling .destroy()', async () => {
+  it('should run query and close connection by calling .close()', async () => {
     const result = await adapter.query('SELECT 1 as num');
     expect(result.rows).toEqual([{ num: 1 }]);
 
-    await adapter.destroy();
+    await adapter.close();
   });
 });

package/src/adapter.ts

@@ -99,7 +99,7 @@ export class Adapter {
     }
   }
 
-  destroy(): Promise<void> {
+  close(): Promise<void> {
     return this.pool.end();
   }
 }
@@ -167,7 +167,7 @@ export class TransactionAdapter implements Adapter {
     return await cb(this);
   }
 
-  destroy() {
+  close() {
     return this.pool.end();
   }
 }

package/src/db.ts

@@ -162,7 +162,7 @@ type DbResult<CT extends ColumnTypesBase> = Db & {
   ): Db<Table, Shape>;
 
   adapter: Adapter;
-  destroy: Adapter['destroy'];
+  close: Adapter['close'];
 };
 
 export type DbOptions<CT extends ColumnTypesBase = ColumnTypes> = (
@@ -206,7 +206,7 @@ export const createDb = <CT extends ColumnTypesBase = ColumnTypes>({
       );
     },
     qb,
-    { adapter, destroy: () => adapter.destroy() },
+    { adapter, close: () => adapter.close() },
   );
 
   // Set all methods from prototype to the db instance (needed for transaction at least):

package/src/queryMethods/insert.ts

@@ -67,10 +67,25 @@ type InsertBelongsToData<
       keyof T[defaultsKey]
     >
   | {
-      [K in Key]: {
-        create?: InsertData<Rel['nestedCreateQuery']>;
-        connect?: WhereArg<Rel['model']>;
-      };
+      [K in Key]:
+        | {
+            create: InsertData<Rel['nestedCreateQuery']>;
+            connect?: never;
+            connectOrCreate?: never;
+          }
+        | {
+            create?: never;
+            connect: WhereArg<Rel['model']>;
+            connectOrCreate?: never;
+          }
+        | {
+            create?: never;
+            connect?: never;
+            connectOrCreate: {
+              where: WhereArg<Rel['model']>;
+              create: InsertData<Rel['nestedCreateQuery']>;
+            };
+          };
     };
 
 type InsertHasOneData<
@@ -81,10 +96,25 @@ type InsertHasOneData<
   ? // eslint-disable-next-line @typescript-eslint/ban-types
     {}
   : {
-      [K in Key]?: {
-        create?: InsertData<Rel['nestedCreateQuery']>;
-        connect?: WhereArg<Rel['model']>;
-      };
+      [K in Key]?:
+        | {
+            create: InsertData<Rel['nestedCreateQuery']>;
+            connect?: never;
+            connectOrCreate?: never;
+          }
+        | {
+            create?: never;
+            connect: WhereArg<Rel['model']>;
+            connectOrCreate?: never;
+          }
+        | {
+            create?: never;
+            connect?: never;
+            connectOrCreate: {
+              where?: WhereArg<Rel['model']>;
+              create?: InsertData<Rel['nestedCreateQuery']>;
+            };
+          };
     };
 
 type InsertHasManyData<

package/src/relations.ts

@@ -1,11 +1,14 @@
 import { defaultsKey, Query, QueryBase, QueryWithTable } from './query';
-import { WhereArg } from './queryMethods/where';
+import { WhereArg, UpdateData } from './queryMethods';
 import { MaybeArray } from './utils';
-import { UpdateData } from './queryMethods/update';
 
 export type NestedInsertOneItem = {
   create?: Record<string, unknown>;
   connect?: WhereArg<QueryBase>;
+  connectOrCreate?: {
+    where: WhereArg<QueryBase>;
+    create: Record<string, unknown>;
+  };
 };
 
 export type NestedInsertManyItems = {