addressing PR comments

Author: ymc9

packages/orm/src/client/crud/operations/base.ts

@@ -26,6 +26,8 @@ import {
     createInvalidInputError,
     createNotFoundError,
     createNotSupportedError,
+    ORMError,
+    ORMErrorReason,
 } from '../../errors';
 import type { ToKysely } from '../../query-builder';
 import {
@@ -2138,7 +2140,7 @@ export abstract class BaseOperationHandler<Schema extends SchemaDef> {
     protected async executeQueryTakeFirstOrThrow(kysely: ToKysely<Schema>, query: Compilable, operation: string) {
         const result = await kysely.executeQuery(query.compile(), this.makeQueryId(operation));
         if (result.rows.length === 0) {
-            throw createNotFoundError('No rows found');
+            throw new ORMError(ORMErrorReason.NOT_FOUND, 'No rows found');
         }
         return result.rows[0];
     }

packages/orm/src/client/errors.ts

@@ -122,6 +122,7 @@ export function createInvalidInputError(message: string, model?: string, options
 export function createDBQueryError(message: string, dbError: unknown, sql: string, parameters: readonly unknown[]) {
     const error = new ORMError(ORMErrorReason.DB_QUERY_ERROR, message, { cause: dbError });
     error.dbErrorCode = getDbErrorCode(dbError);
+    error.dbErrorMessage = dbError instanceof Error ? dbError.message : undefined;
     error.sql = sql;
     error.sqlParams = parameters;
     return error;

packages/server/src/api/rpc/index.ts

@@ -212,7 +212,8 @@ export class RPCApiHandler<Schema extends SchemaDef> implements ApiHandler<Schem
             .with(ORMErrorReason.DB_QUERY_ERROR, () => {
                 status = 400;
                 error.dbErrorCode = err.dbErrorCode;
-            });
+            })
+            .otherwise(() => {});
 
         const resp = { status, body: { error } };
         log(this.options.log, 'debug', () => `sending error response: ${safeJSONStringify(resp)}`);

tests/e2e/orm/client-api/error-handling.test.ts

@@ -43,7 +43,10 @@ model User {
 
         await expect(db.user.create({ data: { email: '[email protected]' } })).rejects.toSatisfy(
             (e) =>
-                e instanceof ORMError && e.reason === ORMErrorReason.DB_QUERY_ERROR && e.dbErrorCode === expectedCode,
+                e instanceof ORMError &&
+                e.reason === ORMErrorReason.DB_QUERY_ERROR &&
+                e.dbErrorCode === expectedCode &&
+                !!e.dbErrorMessage?.includes('constraint'),
         );
     });
 });