pqb 0.4.2 → 0.4.4

package/package.json

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

package/src/queryMethods/create.ts

@@ -25,6 +25,7 @@ import { EmptyObject, SetOptional } from '../utils';
 import { InsertQueryData, OnConflictItem, OnConflictMergeUpdate } from '../sql';
 import { WhereArg } from './where';
 import { parseResult, queryMethodByReturnType } from './then';
+import { NotFoundError } from '../errors';
 
 export type CreateData<
   T extends Query,
@@ -351,6 +352,19 @@ const insert = (
     );
   }
 
+  if (
+    returnType === 'oneOrThrow' ||
+    q.query.fromQuery?.query.returnType === 'oneOrThrow'
+  ) {
+    const { handleResult } = q.query;
+    q.query.handleResult = async (q, r) => {
+      if (r.rowCount === 0) {
+        throw new NotFoundError();
+      }
+      return await handleResult(q, r);
+    };
+  }
+
   const appendRelationsKeys = Object.keys(ctx.appendRelations);
   if (appendRelationsKeys.length) {
     if (!returning?.includes('*')) {

package/src/relations.ts

@@ -188,11 +188,12 @@ type PrepareRelationQuery<
   T extends Query,
   RelationName extends PropertyKey,
   Required extends boolean,
+  Populate extends string,
 > = Omit<T, 'tableAlias'> & {
   tableAlias: RelationName extends string ? RelationName : never;
   [isRequiredRelationKey]: Required;
   [relationQueryKey]: string;
-};
+} & { [defaultsKey]: Record<Populate, true> };
 
 export type RelationQuery<
   Name extends PropertyKey = string,
@@ -202,8 +203,8 @@ export type RelationQuery<
   Required extends boolean = boolean,
   ChainedCreate extends boolean = false,
   Q extends RelationQueryBase = ChainedCreate extends true
-    ? PrepareRelationQuery<T, Name, Required>
-    : PrepareRelationQuery<T, Name, Required> & {
+    ? PrepareRelationQuery<T, Name, Required, Populate>
+    : PrepareRelationQuery<T, Name, Required, Populate> & {
         [K in CreateMethodsNames]: never;
       },
-> = ((params: Params) => Q & { [defaultsKey]: Record<Populate, true> }) & Q;
+> = ((params: Params) => Q) & Q;