@prairielearn/postgres 3.0.0 → 4.0.0

package/src/default-pool.ts

@@ -11,55 +11,177 @@ export { defaultPool, type CursorIterator, type QueryParams };
 // that they'll be invoked with the correct `this` context, specifically when
 // this module is imported as `import * as db from '...'` and that import is
 // subsequently transformed by Babel to `interopRequireWildcard(...)`.
-export const init = defaultPool.init.bind(defaultPool);
+
+// VSCode currently doesn't allow for us to use `inheritDoc` to inherit the
+// documentation from the `PostgresPool` class. We mirror the documentation
+// here for *async methods* in VSCode intellisense.
+
+/**
+ * Creates a new connection pool and attempts to connect to the database.
+ */
 export const initAsync = defaultPool.initAsync.bind(defaultPool);
-export const close = defaultPool.close.bind(defaultPool);
+/**
+ * Closes the connection pool.
+ */
 export const closeAsync = defaultPool.closeAsync.bind(defaultPool);
+/**
+ * Gets a new client from the connection pool. The caller MUST call `release()` to
+ * release the client, whether or not errors occurred while using
+ * `client`. The client can call `done(truthy_value)` to force
+ * destruction of the client, but this should not be used except in
+ * unusual circumstances.
+ */
 export const getClientAsync = defaultPool.getClientAsync.bind(defaultPool);
-export const getClient = defaultPool.getClient.bind(defaultPool);
-export const queryWithClient = defaultPool.queryWithClient.bind(defaultPool);
+
+/**
+ * Performs a query with the given client.
+ */
 export const queryWithClientAsync = defaultPool.queryWithClientAsync.bind(defaultPool);
-export const queryWithClientOneRow = defaultPool.queryWithClientOneRow.bind(defaultPool);
+
+/**
+ * Performs a query with the given client. Errors if the query returns more
+ * than one row.
+ */
 export const queryWithClientOneRowAsync = defaultPool.queryWithClientOneRowAsync.bind(defaultPool);
-export const queryWithClientZeroOrOneRow =
-  defaultPool.queryWithClientZeroOrOneRow.bind(defaultPool);
+
+/**
+ * Performs a query with the given client. Errors if the query returns more
+ * than one row.
+ */
 export const queryWithClientZeroOrOneRowAsync =
   defaultPool.queryWithClientZeroOrOneRowAsync.bind(defaultPool);
+/**
+ * Rolls back the current transaction for the given client.
+ */
 export const rollbackWithClientAsync = defaultPool.rollbackWithClientAsync.bind(defaultPool);
-export const rollbackWithClient = defaultPool.rollbackWithClient.bind(defaultPool);
 export const beginTransactionAsync = defaultPool.beginTransactionAsync.bind(defaultPool);
+/**
+ * Commits the transaction if err is null, otherwise rollbacks the transaction.
+ * Also releases the client.
+ */
 export const endTransactionAsync = defaultPool.endTransactionAsync.bind(defaultPool);
-export const endTransaction = defaultPool.endTransaction.bind(defaultPool);
+/**
+ * Runs the specified function inside of a transaction. The function will
+ * receive a database client as an argument, but it can also make queries
+ * as usual, and the correct client will be used automatically.
+ *
+ * The transaction will be rolled back if the function throws an error, and
+ * will be committed otherwise.
+ */
 export const runInTransactionAsync = defaultPool.runInTransactionAsync.bind(defaultPool);
-export const query = defaultPool.query.bind(defaultPool);
+/**
+ * Executes a query with the specified parameters.
+ *
+ * Using the return value of this function directly is not recommended. Instead, use
+ * {@link queryRows}, {@link queryRow}, or {@link queryOptionalRow}.
+ */
 export const queryAsync = defaultPool.queryAsync.bind(defaultPool);
-export const queryOneRow = defaultPool.queryOneRow.bind(defaultPool);
+/**
+ * Executes a query with the specified parameters. Errors if the query does
+ * not return exactly one row.
+ *
+ * @deprecated Use {@link queryRow} instead.
+ */
 export const queryOneRowAsync = defaultPool.queryOneRowAsync.bind(defaultPool);
-export const queryZeroOrOneRow = defaultPool.queryZeroOrOneRow.bind(defaultPool);
+/**
+ * Executes a query with the specified parameters. Errors if the query
+ * returns more than one row.
+ *
+ * @deprecated Use {@link queryOptionalRow} instead.
+ */
 export const queryZeroOrOneRowAsync = defaultPool.queryZeroOrOneRowAsync.bind(defaultPool);
-export const call = defaultPool.call.bind(defaultPool);
+/**
+ * Calls the given sproc with the specified parameters.
+ *
+ * @deprecated Use {@link callRows} instead.
+ */
 export const callAsync = defaultPool.callAsync.bind(defaultPool);
-export const callOneRow = defaultPool.callOneRow.bind(defaultPool);
+/**
+ * Calls the given sproc with the specified parameters. Errors if the
+ * sproc does not return exactly one row.
+ *
+ * @deprecated Use {@link callRow} instead.
+ */
 export const callOneRowAsync = defaultPool.callOneRowAsync.bind(defaultPool);
-export const callZeroOrOneRow = defaultPool.callZeroOrOneRow.bind(defaultPool);
+/**
+ * Calls the given sproc with the specified parameters. Errors if the
+ * sproc returns more than one row.
+ *
+ * @deprecated Use {@link callOptionalRow} instead.
+ */
 export const callZeroOrOneRowAsync = defaultPool.callZeroOrOneRowAsync.bind(defaultPool);
-export const callWithClient = defaultPool.callWithClient.bind(defaultPool);
+/**
+ * Calls a sproc with the specified parameters using a specific client.
+ */
 export const callWithClientAsync = defaultPool.callWithClientAsync.bind(defaultPool);
-export const callWithClientOneRow = defaultPool.callWithClientOneRow.bind(defaultPool);
+/**
+ * Calls a sproc with the specified parameters using a specific client.
+ * Errors if the sproc does not return exactly one row.
+ */
 export const callWithClientOneRowAsync = defaultPool.callWithClientOneRowAsync.bind(defaultPool);
-export const callWithClientZeroOrOneRow = defaultPool.callWithClientZeroOrOneRow.bind(defaultPool);
+/**
+ * Calls a sproc with the specified parameters using a specific client.
+ * Errors if the sproc returns more than one row.
+ */
 export const callWithClientZeroOrOneRowAsync =
   defaultPool.callWithClientZeroOrOneRowAsync.bind(defaultPool);
+/**
+ * Executes a query with the specified parameters. Returns an array of rows
+ * that conform to the given Zod schema.
+ *
+ * If the query returns a single column, the return value will be a list of column values.
+ */
 export const queryRows = defaultPool.queryRows.bind(defaultPool);
+/**
+ * Executes a query with the specified parameters. Returns exactly one row that conforms to the given Zod schema.
+ *
+ * If the query returns a single column, the return value will be the column value itself.
+ */
 export const queryRow = defaultPool.queryRow.bind(defaultPool);
+/**
+ * Executes a query with the specified parameters. Returns either null or a
+ * single row that conforms to the given Zod schema, and errors otherwise.
+ *
+ * If the query returns a single column, the return value will be the column value itself.
+ */
 export const queryOptionalRow = defaultPool.queryOptionalRow.bind(defaultPool);
+/**
+ * Calls the given sproc with the specified parameters.
+ * Errors if the sproc does not return anything.
+ */
 export const callRows = defaultPool.callRows.bind(defaultPool);
+/**
+ * Calls the given sproc with the specified parameters.
+ * Returns exactly one row from the sproc that conforms to the given Zod schema.
+ */
 export const callRow = defaultPool.callRow.bind(defaultPool);
+/**
+ * Calls the given sproc with the specified parameters. Returns either null
+ * or a single row that conforms to the given Zod schema.
+ */
 export const callOptionalRow = defaultPool.callOptionalRow.bind(defaultPool);
-export const queryCursorWithClient = defaultPool.queryCursorWithClient.bind(defaultPool);
+/**
+ * Returns an {@link CursorIterator} that can be used to iterate over the
+ * results of the query in batches, which is useful for large result sets.
+ * Each row will be parsed by the given Zod schema.
+ */
 export const queryCursor = defaultPool.queryCursor.bind(defaultPool);
-export const queryValidatedCursor = defaultPool.queryValidatedCursor.bind(defaultPool);
+/**
+ * Set the schema to use for the search path.
+ *
+ * @param schema The schema name to use (can be "null" to unset the search path)
+ */
 export const setSearchSchema = defaultPool.setSearchSchema.bind(defaultPool);
+/**
+ * Get the schema that is currently used for the search path.
+ *
+ * @return schema in use (may be `null` to indicate no schema)
+ */
 export const getSearchSchema = defaultPool.getSearchSchema.bind(defaultPool);
-export const setRandomSearchSchema = defaultPool.setRandomSearchSchema.bind(defaultPool);
+/**
+ * Generate, set, and return a random schema name.
+ *
+ * @param prefix The prefix of the new schema, only the first 28 characters will be used (after lowercasing).
+ * @returns The randomly-generated search schema.
+ */
 export const setRandomSearchSchemaAsync = defaultPool.setRandomSearchSchemaAsync.bind(defaultPool);

package/src/pool.test.ts

@@ -13,7 +13,6 @@ import {
   queryOptionalRow,
   queryRow,
   queryRows,
-  queryValidatedCursor,
 } from './default-pool.js';
 import { makePostgresTestUtils } from './test-utils.js';
 
@@ -256,7 +255,11 @@ describe('@prairielearn/postgres', function () {
 
   describe('queryCursor', () => {
     it('returns zero rows', async () => {
-      const cursor = await queryCursor('SELECT * FROM workspaces WHERE id = 10000;', {});
+      const cursor = await queryCursor(
+        'SELECT * FROM workspaces WHERE id = 10000;',
+        {},
+        z.unknown(),
+      );
       const rowBatches = [];
       for await (const rows of cursor.iterate(10)) {
         rowBatches.push(rows);
@@ -265,7 +268,7 @@ describe('@prairielearn/postgres', function () {
     });
 
     it('returns one row at a time', async () => {
-      const cursor = await queryCursor('SELECT * FROM workspaces WHERE id <= 2;', {});
+      const cursor = await queryCursor('SELECT * FROM workspaces WHERE id <= 2;', {}, z.unknown());
       const rowBatches = [];
       for await (const rows of cursor.iterate(1)) {
         rowBatches.push(rows);
@@ -276,7 +279,7 @@ describe('@prairielearn/postgres', function () {
     });
 
     it('returns all rows at once', async () => {
-      const cursor = queryCursor('SELECT * FROM workspaces WHERE id <= 10;', {});
+      const cursor = queryCursor('SELECT * FROM workspaces WHERE id <= 10;', {}, z.unknown());
       const rowBatches = [];
       for await (const rows of (await cursor).iterate(10)) {
         rowBatches.push(rows);
@@ -286,7 +289,7 @@ describe('@prairielearn/postgres', function () {
     });
 
     it('handles errors', async () => {
-      const cursor = await queryCursor('NOT VALID SQL', {});
+      const cursor = await queryCursor('NOT VALID SQL', {}, z.unknown());
 
       async function readAllRows() {
         const allRows = [];
@@ -307,7 +310,7 @@ describe('@prairielearn/postgres', function () {
     });
   });
 
-  describe('queryValidatedCursor', () => {
+  describe('queryCursor', () => {
     const WorkspaceSchema = z.object({
       id: z.string(),
     });
@@ -318,7 +321,7 @@ describe('@prairielearn/postgres', function () {
 
     describe('iterator', () => {
       it('validates with provided schema', async () => {
-        const cursor = await queryValidatedCursor(
+        const cursor = await queryCursor(
           'SELECT * FROM workspaces WHERE id <= 10 ORDER BY id ASC;',
           {},
           WorkspaceSchema,
@@ -334,7 +337,7 @@ describe('@prairielearn/postgres', function () {
       });
 
       it('throws error when validation fails', async () => {
-        const cursor = await queryValidatedCursor(
+        const cursor = await queryCursor(
           'SELECT * FROM workspaces WHERE id <= 10 ORDER BY id ASC;',
           {},
           BadWorkspaceSchema,
@@ -356,7 +359,7 @@ describe('@prairielearn/postgres', function () {
 
     describe('stream', () => {
       it('validates with provided schema', async () => {
-        const cursor = await queryValidatedCursor(
+        const cursor = await queryCursor(
           'SELECT * FROM workspaces WHERE id <= 10 ORDER BY id ASC;',
           {},
           WorkspaceSchema,
@@ -371,7 +374,7 @@ describe('@prairielearn/postgres', function () {
       });
 
       it('emits an error when validation fails', async () => {
-        const cursor = await queryValidatedCursor(
+        const cursor = await queryCursor(
           'SELECT * FROM workspaces ORDER BY id ASC;',
           {},
           BadWorkspaceSchema,
@@ -392,7 +395,7 @@ describe('@prairielearn/postgres', function () {
       });
 
       it('closes the cursor when the stream is closed', async () => {
-        const cursor = await queryValidatedCursor('SELECT * FROM workspaces;', {}, WorkspaceSchema);
+        const cursor = await queryCursor('SELECT * FROM workspaces;', {}, WorkspaceSchema);
         const stream = cursor.stream(1);
 
         const rows: any[] = [];

package/src/pool.ts

@@ -1,6 +1,5 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { Readable, Transform } from 'node:stream';
-import { callbackify } from 'node:util';
 
 import debugfn from 'debug';
 import _ from 'lodash';
@@ -220,11 +219,6 @@ export class PostgresPool {
     }
   }
 
-  /**
-   * Creates a new connection pool and attempts to connect to the database.
-   */
-  init = callbackify(this.initAsync);
-
   /**
    * Closes the connection pool.
    */
@@ -235,14 +229,7 @@ export class PostgresPool {
   }
 
   /**
-   * Closes the connection pool.
-   */
-  close = callbackify(this.closeAsync);
-
-  /**
-   * Gets a new client from the connection pool. If `err` is not null
-   * then `client` and `done` are undefined. If `err` is null then
-   * `client` is valid and can be used. The caller MUST call `done()` to
+   * Gets a new client from the connection pool. The caller MUST call `release()` to
    * release the client, whether or not errors occurred while using
    * `client`. The client can call `done(truthy_value)` to force
    * destruction of the client, but this should not be used except in
@@ -290,15 +277,6 @@ export class PostgresPool {
     return client;
   }
 
-  /**
-   * Gets a new client from the connection pool.
-   */
-  getClient(callback: (error: Error | null, client?: pg.PoolClient, done?: () => void) => void) {
-    this.getClientAsync()
-      .then((client) => callback(null, client, client.release))
-      .catch((err) => callback(err));
-  }
-
   /**
    * Performs a query with the given client.
    */
@@ -321,11 +299,6 @@ export class PostgresPool {
     }
   }
 
-  /**
-   * Performs a query with the given client.
-   */
-  queryWithClient = callbackify(this.queryWithClientAsync);
-
   /**
    * Performs a query with the given client. Errors if the query returns more
    * than one row.
@@ -349,12 +322,6 @@ export class PostgresPool {
     return result;
   }
 
-  /**
-   * Performs a query with the given client. Errors if the query returns more
-   * than one row.
-   */
-  queryWithClientOneRow = callbackify(this.queryWithClientOneRowAsync);
-
   /**
    * Performs a query with the given client. Errors if the query returns more
    * than one row.
@@ -378,12 +345,6 @@ export class PostgresPool {
     return result;
   }
 
-  /**
-   * Performs a query with the given client. Errors if the query returns more
-   * than one row.
-   */
-  queryWithClientZeroOrOneRow = callbackify(this.queryWithClientZeroOrOneRowAsync);
-
   /**
    * Rolls back the current transaction for the given client.
    */
@@ -406,21 +367,6 @@ export class PostgresPool {
     }
   }
 
-  /**
-   * Rolls back the current transaction for the given client.
-   */
-  rollbackWithClient(
-    client: pg.PoolClient,
-    _done: (release?: any) => void,
-    callback: (err: Error | null) => void,
-  ) {
-    // Note that we can't use `util.callbackify` here because this function
-    // has an additional unused `done` parameter for backwards compatibility.
-    this.rollbackWithClientAsync(client)
-      .then(() => callback(null))
-      .catch((err) => callback(err));
-  }
-
   /**
    * Begins a new transaction.
    */
@@ -465,21 +411,6 @@ export class PostgresPool {
     }
   }
 
-  /**
-   * Commits the transaction if err is null, otherwise rollbacks the transaction.
-   * Also releases the client.
-   */
-  endTransaction(
-    client: pg.PoolClient,
-    _done: (rollback?: any) => void,
-    err: Error | null | undefined,
-    callback: (error: Error | null) => void,
-  ): void {
-    this.endTransactionAsync(client, err)
-      .then(() => callback(null))
-      .catch((error) => callback(error));
-  }
-
   /**
    * Runs the specified function inside of a transaction. The function will
    * receive a database client as an argument, but it can also make queries
@@ -537,11 +468,6 @@ export class PostgresPool {
     }
   }
 
-  /**
-   * Executes a query with the specified parameters.
-   */
-  query = callbackify(this.queryAsync);
-
   /**
    * Executes a query with the specified parameters. Errors if the query does
    * not return exactly one row.
@@ -560,12 +486,6 @@ export class PostgresPool {
     return result;
   }
 
-  /**
-   * Executes a query with the specified parameters. Errors if the query does
-   * not return exactly one row.
-   */
-  queryOneRow = callbackify(this.queryOneRowAsync);
-
   /**
    * Executes a query with the specified parameters. Errors if the query
    * returns more than one row.
@@ -585,13 +505,7 @@ export class PostgresPool {
   }
 
   /**
-   * Executes a query with the specified parameters. Errors if the query
-   * returns more than one row.
-   */
-  queryZeroOrOneRow = callbackify(this.queryZeroOrOneRowAsync);
-
-  /**
-   * Calls the given function with the specified parameters.
+   * Calls the given sproc with the specified parameters.
    */
   async callAsync(functionName: string, params: any[]): Promise<pg.QueryResult> {
     debug('call()', 'function:', functionName);
@@ -604,13 +518,8 @@ export class PostgresPool {
   }
 
   /**
-   * Calls the given function with the specified parameters.
-   */
-  call = callbackify(this.callAsync);
-
-  /**
-   * Calls the given function with the specified parameters. Errors if the
-   * function does not return exactly one row.
+   * Calls the given sproc with the specified parameters. Errors if the
+   * sproc does not return exactly one row.
    */
   async callOneRowAsync(functionName: string, params: any[]): Promise<pg.QueryResult> {
     debug('callOneRow()', 'function:', functionName);
@@ -627,14 +536,8 @@ export class PostgresPool {
   }
 
   /**
-   * Calls the given function with the specified parameters. Errors if the
-   * function does not return exactly one row.
-   */
-  callOneRow = callbackify(this.callOneRowAsync);
-
-  /**
-   * Calls the given function with the specified parameters. Errors if the
-   * function returns more than one row.
+   * Calls the given sproc with the specified parameters. Errors if the
+   * sproc returns more than one row.
    */
   async callZeroOrOneRowAsync(functionName: string, params: any[]): Promise<pg.QueryResult> {
     debug('callZeroOrOneRow()', 'function:', functionName);
@@ -651,13 +554,7 @@ export class PostgresPool {
   }
 
   /**
-   * Calls the given function with the specified parameters. Errors if the
-   * function returns more than one row.
-   */
-  callZeroOrOneRow = callbackify(this.callZeroOrOneRowAsync);
-
-  /**
-   * Calls a function with the specified parameters using a specific client.
+   * Calls a sproc with the specified parameters using a specific client.
    */
   async callWithClientAsync(
     client: pg.PoolClient,
@@ -674,13 +571,8 @@ export class PostgresPool {
   }
 
   /**
-   * Calls a function with the specified parameters using a specific client.
-   */
-  callWithClient = callbackify(this.callWithClientAsync);
-
-  /**
-   * Calls a function with the specified parameters using a specific client.
-   * Errors if the function does not return exactly one row.
+   * Calls a sproc with the specified parameters using a specific client.
+   * Errors if the sproc does not return exactly one row.
    */
   async callWithClientOneRowAsync(
     client: pg.PoolClient,
@@ -702,13 +594,7 @@ export class PostgresPool {
 
   /**
    * Calls a function with the specified parameters using a specific client.
-   * Errors if the function does not return exactly one row.
-   */
-  callWithClientOneRow = callbackify(this.callWithClientOneRowAsync);
-
-  /**
-   * Calls a function with the specified parameters using a specific client.
-   * Errors if the function returns more than one row.
+   * Errors if the sproc returns more than one row.
    */
   async callWithClientZeroOrOneRowAsync(
     client: pg.PoolClient,
@@ -728,18 +614,18 @@ export class PostgresPool {
     return result;
   }
 
-  /**
-   * Calls a function with the specified parameters using a specific client.
-   * Errors if the function returns more than one row.
-   */
-  callWithClientZeroOrOneRow = callbackify(this.callWithClientZeroOrOneRowAsync);
-
   async queryRows<Model extends z.ZodTypeAny>(sql: string, model: Model): Promise<z.infer<Model>[]>;
   async queryRows<Model extends z.ZodTypeAny>(
     sql: string,
     params: QueryParams,
     model: Model,
   ): Promise<z.infer<Model>[]>;
+  /**
+   * Executes a query with the specified parameters. Returns an array of rows
+   * that conform to the given Zod schema.
+   *
+   * If the query returns a single column, the return value will be a list of column values.
+   */
   async queryRows<Model extends z.ZodTypeAny>(
     sql: string,
     paramsOrSchema: QueryParams | Model,
@@ -763,6 +649,11 @@ export class PostgresPool {
     params: QueryParams,
     model: Model,
   ): Promise<z.infer<Model>>;
+  /**
+   * Executes a query with the specified parameters. Returns exactly one row that conforms to the given Zod schema.
+   *
+   * If the query returns a single column, the return value will be the column value itself.
+   */
   async queryRow<Model extends z.ZodTypeAny>(
     sql: string,
     paramsOrSchema: QueryParams | Model,
@@ -788,6 +679,12 @@ export class PostgresPool {
     params: QueryParams,
     model: Model,
   ): Promise<z.infer<Model> | null>;
+  /**
+   * Executes a query with the specified parameters. Returns either null or a
+   * single row that conforms to the given Zod schema, and errors otherwise.
+   *
+   * If the query returns a single column, the return value will be the column value itself.
+   */
   async queryOptionalRow<Model extends z.ZodTypeAny>(
     sql: string,
     paramsOrSchema: QueryParams | Model,
@@ -812,6 +709,10 @@ export class PostgresPool {
     params: any[],
     model: Model,
   ): Promise<z.infer<Model>[]>;
+  /**
+   * Calls the given sproc with the specified parameters.
+   * Errors if the sproc does not return anything.
+   */
   async callRows<Model extends z.ZodTypeAny>(
     sql: string,
     paramsOrSchema: any[] | Model,
@@ -835,6 +736,10 @@ export class PostgresPool {
     params: any[],
     model: Model,
   ): Promise<z.infer<Model>>;
+  /**
+   * Calls the given sproc with the specified parameters.
+   * Returns exactly one row from the sproc that conforms to the given Zod schema.
+   */
   async callRow<Model extends z.ZodTypeAny>(
     sql: string,
     paramsOrSchema: any[] | Model,
@@ -860,6 +765,10 @@ export class PostgresPool {
     params: any[],
     model: Model,
   ): Promise<z.infer<Model> | null>;
+  /**
+   * Calls the given sproc with the specified parameters. Returns either null
+   * or a single row that conforms to the given Zod schema.
+   */
   async callOptionalRow<Model extends z.ZodTypeAny>(
     sql: string,
     paramsOrSchema: any[] | Model,
@@ -882,7 +791,7 @@ export class PostgresPool {
    * Returns a {@link Cursor} for the given query. The cursor can be used to
    * read results in batches, which is useful for large result sets.
    */
-  async queryCursorWithClient(
+  private async queryCursorWithClient(
     client: pg.PoolClient,
     sql: string,
     params: QueryParams,
@@ -895,31 +804,20 @@ export class PostgresPool {
     return client.query(new Cursor(processedSql, paramsArray));
   }
 
-  /**
-   * Returns an {@link CursorIterator} that can be used to iterate over the
-   * results of the query in batches, which is useful for large result sets.
-   */
-  async queryCursor<Model extends z.ZodTypeAny>(
-    sql: string,
-    params: QueryParams,
-  ): Promise<CursorIterator<z.infer<Model>>> {
-    return this.queryValidatedCursorInternal(sql, params);
-  }
-
   /**
    * Returns an {@link CursorIterator} that can be used to iterate over the
    * results of the query in batches, which is useful for large result sets.
    * Each row will be parsed by the given Zod schema.
    */
-  async queryValidatedCursor<Model extends z.ZodTypeAny>(
+  async queryCursor<Model extends z.ZodTypeAny>(
     sql: string,
     params: QueryParams,
     model: Model,
   ): Promise<CursorIterator<z.infer<Model>>> {
-    return this.queryValidatedCursorInternal(sql, params, model);
+    return this.queryCursorInternal(sql, params, model);
   }
 
-  private async queryValidatedCursorInternal<Model extends z.ZodTypeAny>(
+  private async queryCursorInternal<Model extends z.ZodTypeAny>(
     sql: string,
     params: QueryParams,
     model?: Model,
@@ -1042,11 +940,6 @@ export class PostgresPool {
     return schema;
   }
 
-  /**
-   * Generate, set, and return a random schema name.
-   */
-  setRandomSearchSchema = callbackify(this.setRandomSearchSchemaAsync);
-
   /** The number of established connections. */
   get totalCount() {
     return this.pool?.totalCount ?? 0;