src/connectionMethods/anyFirst.ts

@@ -11,10 +11,10 @@ import {
   any,
 } from './any';
 
-export const anyFirst: InternalQueryMethod = async (log, connection, clientConfigurationType, slonikSql, inheritedQueryId) => {
+export const anyFirst: InternalQueryMethod = async (log, connection, clientConfigurationType, query, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
-  const rows = await any(log, connection, clientConfigurationType, slonikSql, queryId);
+  const rows = await any(log, connection, clientConfigurationType, query, queryId);
 
   if (rows.length === 0) {
     return [];
@@ -29,7 +29,7 @@ export const anyFirst: InternalQueryMethod = async (log, connection, clientConfi
       queryId,
     }, 'result row has no columns');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(query);
   }
 
   const firstColumnName = keys[0];

src/connectionMethods/exists.ts

@@ -12,7 +12,7 @@ import {
   query,
 } from './query';
 
-export const exists: InternalQueryMethod<Promise<boolean>> = async (log, connection, clientConfiguration, slonikSql, inheritedQueryId) => {
+export const exists: InternalQueryMethod<Promise<boolean>> = async (log, connection, clientConfiguration, slonikQuery, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
   const {
@@ -22,8 +22,8 @@ export const exists: InternalQueryMethod<Promise<boolean>> = async (log, connect
     connection,
     clientConfiguration,
     {
-      sql: 'SELECT EXISTS(' + slonikSql.sql + ')',
-      values: slonikSql.values,
+      sql: 'SELECT EXISTS(' + slonikQuery.sql + ')',
+      values: slonikQuery.values,
     } as TaggedTemplateLiteralInvocation,
     queryId,
   );
@@ -33,7 +33,7 @@ export const exists: InternalQueryMethod<Promise<boolean>> = async (log, connect
       queryId,
     }, 'DataIntegrityError');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(slonikQuery);
   }
 
   return Boolean((rows[0] as Record<string, unknown>).exists);

src/connectionMethods/many.ts

@@ -16,19 +16,19 @@ import {
  *
  * @throws NotFoundError If query returns no rows.
  */
-export const many: InternalQueryMethod = async (log, connection, clientConfiguration, slonikSql, inheritedQueryId) => {
+export const many: InternalQueryMethod = async (log, connection, clientConfiguration, slonikQuery, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
   const {
     rows,
-  } = await query(log, connection, clientConfiguration, slonikSql, queryId);
+  } = await query(log, connection, clientConfiguration, slonikQuery, queryId);
 
   if (rows.length === 0) {
     log.error({
       queryId,
     }, 'NotFoundError');
 
-    throw new NotFoundError();
+    throw new NotFoundError(slonikQuery);
   }
 
   return rows;

src/connectionMethods/manyFirst.ts

@@ -11,17 +11,17 @@ import {
   many,
 } from './many';
 
-export const manyFirst: InternalQueryMethod = async (log, connection, clientConfigurationType, slonikSql, inheritedQueryId) => {
+export const manyFirst: InternalQueryMethod = async (log, connection, clientConfigurationType, query, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
-  const rows = await many(log, connection, clientConfigurationType, slonikSql, queryId);
+  const rows = await many(log, connection, clientConfigurationType, query, queryId);
 
   if (rows.length === 0) {
     log.error({
       queryId,
     }, 'DataIntegrityError');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(query);
   }
 
   const keys = Object.keys(rows[0] as Record<string, unknown>);
@@ -31,7 +31,7 @@ export const manyFirst: InternalQueryMethod = async (log, connection, clientConf
       queryId,
     }, 'DataIntegrityError');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(query);
   }
 
   const firstColumnName = keys[0];

src/connectionMethods/maybeOne.ts

@@ -16,12 +16,12 @@ import {
  *
  * @throws DataIntegrityError If query returns multiple rows.
  */
-export const maybeOne: InternalQueryMethod = async (log, connection, clientConfiguration, slonikSql, inheritedQueryId) => {
+export const maybeOne: InternalQueryMethod = async (log, connection, clientConfiguration, slonikQuery, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
   const {
     rows,
-  } = await query(log, connection, clientConfiguration, slonikSql, queryId);
+  } = await query(log, connection, clientConfiguration, slonikQuery, queryId);
 
   if (rows.length === 0) {
     return null;
@@ -32,7 +32,7 @@ export const maybeOne: InternalQueryMethod = async (log, connection, clientConfi
       queryId,
     }, 'DataIntegrityError');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(slonikQuery);
   }
 
   return rows[0];

src/connectionMethods/maybeOneFirst.ts

@@ -17,14 +17,14 @@ import {
  *
  * @throws DataIntegrityError If query returns multiple rows.
  */
-export const maybeOneFirst: InternalQueryMethod = async (log, connection, clientConfiguration, slonikSql, inheritedQueryId) => {
+export const maybeOneFirst: InternalQueryMethod = async (log, connection, clientConfiguration, query, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
   const row = await maybeOne(
     log,
     connection,
     clientConfiguration,
-    slonikSql,
+    query,
     queryId,
   );
 
@@ -39,7 +39,7 @@ export const maybeOneFirst: InternalQueryMethod = async (log, connection, client
       queryId,
     }, 'DataIntegrityError');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(query);
   }
 
   return row[keys[0]];

src/connectionMethods/one.ts

@@ -18,27 +18,27 @@ import {
  * @throws NotFoundError If query returns no rows.
  * @throws DataIntegrityError If query returns multiple rows.
  */
-export const one: InternalQueryMethod = async (log, connection, clientConfiguration, slonikSql, inheritedQueryId) => {
+export const one: InternalQueryMethod = async (log, connection, clientConfiguration, slonikQuery, inheritedQueryId) => {
   const queryId = inheritedQueryId ?? createQueryId();
 
   const {
     rows,
-  } = await query(log, connection, clientConfiguration, slonikSql, queryId);
+  } = await query(log, connection, clientConfiguration, slonikQuery, queryId);
 
   if (rows.length === 0) {
     log.error({
       queryId,
     }, 'NotFoundError');
 
-    throw new NotFoundError();
+    throw new NotFoundError(slonikQuery);
   }
 
   if (rows.length > 1) {
     log.error({
       queryId,
     }, 'DataIntegrityError');
 
-    throw new DataIntegrityError();
+    throw new DataIntegrityError(slonikQuery);
   }
 
   return rows[0];

src/errors.ts

@@ -3,7 +3,10 @@ import {
   type ZodIssue,
 } from 'zod';
 import {
+  type PrimitiveValueExpression,
+
   type SerializableValue,
+  type Query,
 } from './types';
 
 export class SlonikError extends ExtendableError {}
@@ -53,28 +56,45 @@ export class TupleMovedToAnotherPartitionError extends WrappedPGError {
 }
 
 export class NotFoundError extends SlonikError {
-  public constructor () {
+  public sql: string;
+
+  public values: readonly PrimitiveValueExpression[];
+
+  public constructor (query: Query) {
     super('Resource not found.');
+
+    this.sql = query.sql;
+    this.values = query.values;
   }
 }
 
 export class DataIntegrityError extends SlonikError {
-  public constructor () {
+  public sql: string;
+
+  public values: readonly PrimitiveValueExpression[];
+
+  public constructor (query: Query) {
     super('Query returns an unexpected result.');
+
+    this.sql = query.sql;
+    this.values = query.values;
   }
 }
 
 export class SchemaValidationError extends SlonikError {
   public sql: string;
 
+  public values: readonly PrimitiveValueExpression[];
+
   public row: SerializableValue;
 
   public issues: ZodIssue[];
 
-  public constructor (sql: string, row: SerializableValue, issues: ZodIssue[]) {
+  public constructor (query: Query, row: SerializableValue, issues: ZodIssue[]) {
     super('Query returned rows that do not conform with the schema.');
 
-    this.sql = sql;
+    this.sql = query.sql;
+    this.values = query.values;
     this.row = row;
     this.issues = issues;
   }

src/routines/executeQuery.ts

@@ -82,7 +82,7 @@ const createParseInterceptor = (parser: ZodTypeAny): Interceptor => {
         }, 'row failed validation');
 
         throw new SchemaValidationError(
-          actualQuery.sql,
+          actualQuery,
           sanitizeObject(row),
           validationResult.error.issues,
         );

test/dts.ts

@@ -421,8 +421,8 @@ const createSqlTagTypes = () => {
 
 const errorTypes = () => {
   new SlonikError();
-  new NotFoundError();
-  new DataIntegrityError();
+  new NotFoundError(sql`SELECT 1`);
+  new DataIntegrityError(sql`SELECT 1`);
   new InvalidConfigurationError();
   new StatementCancelledError(new Error('Foo'));
   new StatementTimeoutError(new Error('Foo'));