pgsql-test 2.10.0 → 2.11.1

package/admin.js

@@ -105,17 +105,50 @@ class DbAdmin {
         const sql = `GRANT CONNECT ON DATABASE "${db}" TO ${role};`;
         await this.streamSql(sql, db);
     }
+    // TODO: make adminRole a configurable option
+    // ONLY granting admin role for testing purposes, normally the db connection for apps won't have admin role
+    // DO NOT USE THIS FOR PRODUCTION
     async createUserRole(user, password, dbName) {
         const anonRole = (0, roles_1.getRoleName)('anonymous', this.roleConfig);
         const authRole = (0, roles_1.getRoleName)('authenticated', this.roleConfig);
+        const adminRole = (0, roles_1.getRoleName)('administrator', this.roleConfig);
         const sql = `
       DO $$
       BEGIN
+        -- Create role if it doesn't exist
         IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
           CREATE ROLE ${user} LOGIN PASSWORD '${password}';
+        END IF;
+        
+        -- Grant anonymous role if not already granted
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_auth_members am 
+          JOIN pg_roles r1 ON am.roleid = r1.oid 
+          JOIN pg_roles r2 ON am.member = r2.oid 
+          WHERE r1.rolname = '${anonRole}' AND r2.rolname = '${user}'
+        ) THEN
           GRANT ${anonRole} TO ${user};
+        END IF;
+        
+        -- Grant authenticated role if not already granted
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_auth_members am 
+          JOIN pg_roles r1 ON am.roleid = r1.oid 
+          JOIN pg_roles r2 ON am.member = r2.oid 
+          WHERE r1.rolname = '${authRole}' AND r2.rolname = '${user}'
+        ) THEN
           GRANT ${authRole} TO ${user};
         END IF;
+        
+        -- Grant administrator role if not already granted
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_auth_members am 
+          JOIN pg_roles r1 ON am.roleid = r1.oid 
+          JOIN pg_roles r2 ON am.member = r2.oid 
+          WHERE r1.rolname = '${adminRole}' AND r2.rolname = '${user}'
+        ) THEN
+          GRANT ${adminRole} TO ${user};
+        END IF;
       END $$;
     `.trim();
         await this.streamSql(sql, dbName);

package/connect.js

@@ -68,10 +68,14 @@ const getConnections = async (cn = {}, seedAdapters = [seed_1.seed.launchql()])
             throw error;
         }
     }
-    const db = manager.getClient({
+    const dbConfig = {
         ...config,
         user: connOpts.connection.user,
         password: connOpts.connection.password
+    };
+    const db = manager.getClient(dbConfig, {
+        auth: connOpts.auth,
+        roles: connOpts.roles
     });
     db.setContext({ role: (0, roles_1.getDefaultRole)(connOpts) });
     return { pg, db, teardown, manager, admin };

package/esm/admin.js

@@ -102,17 +102,50 @@ export class DbAdmin {
         const sql = `GRANT CONNECT ON DATABASE "${db}" TO ${role};`;
         await this.streamSql(sql, db);
     }
+    // TODO: make adminRole a configurable option
+    // ONLY granting admin role for testing purposes, normally the db connection for apps won't have admin role
+    // DO NOT USE THIS FOR PRODUCTION
     async createUserRole(user, password, dbName) {
         const anonRole = getRoleName('anonymous', this.roleConfig);
         const authRole = getRoleName('authenticated', this.roleConfig);
+        const adminRole = getRoleName('administrator', this.roleConfig);
         const sql = `
       DO $$
       BEGIN
+        -- Create role if it doesn't exist
         IF NOT EXISTS (SELECT 1 FROM pg_roles WHERE rolname = '${user}') THEN
           CREATE ROLE ${user} LOGIN PASSWORD '${password}';
+        END IF;
+        
+        -- Grant anonymous role if not already granted
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_auth_members am 
+          JOIN pg_roles r1 ON am.roleid = r1.oid 
+          JOIN pg_roles r2 ON am.member = r2.oid 
+          WHERE r1.rolname = '${anonRole}' AND r2.rolname = '${user}'
+        ) THEN
           GRANT ${anonRole} TO ${user};
+        END IF;
+        
+        -- Grant authenticated role if not already granted
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_auth_members am 
+          JOIN pg_roles r1 ON am.roleid = r1.oid 
+          JOIN pg_roles r2 ON am.member = r2.oid 
+          WHERE r1.rolname = '${authRole}' AND r2.rolname = '${user}'
+        ) THEN
           GRANT ${authRole} TO ${user};
         END IF;
+        
+        -- Grant administrator role if not already granted
+        IF NOT EXISTS (
+          SELECT 1 FROM pg_auth_members am 
+          JOIN pg_roles r1 ON am.roleid = r1.oid 
+          JOIN pg_roles r2 ON am.member = r2.oid 
+          WHERE r1.rolname = '${adminRole}' AND r2.rolname = '${user}'
+        ) THEN
+          GRANT ${adminRole} TO ${user};
+        END IF;
       END $$;
     `.trim();
         await this.streamSql(sql, dbName);

package/esm/connect.js

@@ -64,10 +64,14 @@ export const getConnections = async (cn = {}, seedAdapters = [seed.launchql()])
             throw error;
         }
     }
-    const db = manager.getClient({
+    const dbConfig = {
         ...config,
         user: connOpts.connection.user,
         password: connOpts.connection.password
+    };
+    const db = manager.getClient(dbConfig, {
+        auth: connOpts.auth,
+        roles: connOpts.roles
     });
     db.setContext({ role: getDefaultRole(connOpts) });
     return { pg, db, teardown, manager, admin };

package/esm/manager.js

@@ -68,11 +68,14 @@ export class PgTestConnector {
         }
         return this.pgPools.get(key);
     }
-    getClient(config) {
+    getClient(config, opts = {}) {
         if (this.shuttingDown) {
             throw new Error('PgTestConnector is shutting down; no new clients allowed');
         }
-        const client = new PgTestClient(config, { trackConnect: (p) => this.registerConnect(p) });
+        const client = new PgTestClient(config, {
+            trackConnect: (p) => this.registerConnect(p),
+            ...opts
+        });
         this.clients.add(client);
         const key = this.dbKey(config);
         this.seenDbConfigs.set(key, config);

package/esm/test-client.js

@@ -1,11 +1,15 @@
 import { Client } from 'pg';
+import { getRoleName } from './roles';
 export class PgTestClient {
     config;
     client;
+    opts;
     ctxStmts = '';
+    contextSettings = {};
     _ended = false;
     connectPromise = null;
     constructor(config, opts = {}) {
+        this.opts = opts;
         this.config = config;
         this.client = new Client({
             host: this.config.host,
@@ -56,12 +60,53 @@ export class PgTestClient {
         await this.commit();
     }
     setContext(ctx) {
-        this.ctxStmts = Object.entries(ctx)
+        Object.assign(this.contextSettings, ctx);
+        this.ctxStmts = Object.entries(this.contextSettings)
             .map(([key, val]) => val === null
             ? `SELECT set_config('${key}', NULL, true);`
             : `SELECT set_config('${key}', '${val}', true);`)
             .join('\n');
     }
+    /**
+     * Set authentication context for the current session.
+     * Configures role and user ID using cascading defaults from options → opts.auth → RoleMapping.
+     */
+    auth(options = {}) {
+        const role = options.role ?? this.opts.auth?.role ?? getRoleName('authenticated', this.opts);
+        const userIdKey = options.userIdKey ?? this.opts.auth?.userIdKey ?? 'jwt.claims.user_id';
+        const userId = options.userId ?? this.opts.auth?.userId ?? null;
+        this.setContext({
+            role,
+            [userIdKey]: userId !== null ? String(userId) : null
+        });
+    }
+    /**
+     * Commit current transaction to make data visible to other connections, then start fresh transaction.
+     * Maintains test isolation by creating a savepoint and reapplying session context.
+     */
+    async publish() {
+        await this.commit(); // make data visible to other sessions
+        await this.begin(); // fresh tx
+        await this.savepoint(); // keep rollback harness
+        await this.ctxQuery(); // reapply all setContext()
+    }
+    /**
+     * Clear all session context variables and reset to default anonymous role.
+     */
+    clearContext() {
+        const defaultRole = getRoleName('anonymous', this.opts);
+        const nulledSettings = {};
+        Object.keys(this.contextSettings).forEach(key => {
+            nulledSettings[key] = null;
+        });
+        nulledSettings.role = defaultRole;
+        this.ctxStmts = Object.entries(nulledSettings)
+            .map(([key, val]) => val === null
+            ? `SELECT set_config('${key}', NULL, true);`
+            : `SELECT set_config('${key}', '${val}', true);`)
+            .join('\n');
+        this.contextSettings = { role: defaultRole };
+    }
     async any(query, values) {
         const result = await this.query(query, values);
         return result.rows;

package/manager.d.ts

@@ -1,6 +1,6 @@
 import { Pool } from 'pg';
 import { PgConfig } from 'pg-env';
-import { PgTestClient } from './test-client';
+import { PgTestClient, PgTestClientOpts } from './test-client';
 export declare class PgTestConnector {
     private static instance;
     private readonly clients;
@@ -17,7 +17,7 @@ export declare class PgTestConnector {
     private registerConnect;
     private awaitPendingConnects;
     getPool(config: PgConfig): Pool;
-    getClient(config: PgConfig): PgTestClient;
+    getClient(config: PgConfig, opts?: Partial<PgTestClientOpts>): PgTestClient;
     closeAll(): Promise<void>;
     close(): void;
     drop(config: PgConfig): void;

package/manager.js

@@ -71,11 +71,14 @@ class PgTestConnector {
         }
         return this.pgPools.get(key);
     }
-    getClient(config) {
+    getClient(config, opts = {}) {
         if (this.shuttingDown) {
             throw new Error('PgTestConnector is shutting down; no new clients allowed');
         }
-        const client = new test_client_1.PgTestClient(config, { trackConnect: (p) => this.registerConnect(p) });
+        const client = new test_client_1.PgTestClient(config, {
+            trackConnect: (p) => this.registerConnect(p),
+            ...opts
+        });
         this.clients.add(client);
         const key = this.dbKey(config);
         this.seenDbConfigs.set(key, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-test",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "description": "pgsql-test offers isolated, role-aware, and rollback-friendly PostgreSQL environments for integration tests — giving developers realistic test coverage without external state pollution",
   "main": "index.js",
@@ -60,14 +60,14 @@
     "@types/pg-copy-streams": "^1.2.5"
   },
   "dependencies": {
-    "@launchql/core": "^2.11.0",
-    "@launchql/env": "^2.4.0",
-    "@launchql/server-utils": "^2.4.0",
-    "@launchql/types": "^2.5.0",
+    "@launchql/core": "^2.11.1",
+    "@launchql/env": "^2.4.1",
+    "@launchql/server-utils": "^2.4.1",
+    "@launchql/types": "^2.6.0",
     "pg": "^8.16.0",
-    "pg-cache": "^1.3.0",
+    "pg-cache": "^1.3.1",
     "pg-copy-streams": "^6.0.6",
     "pg-env": "^1.1.0"
   },
-  "gitHead": "f7d2375e14a9f45ebb00d58ab87c0efd6bd50618"
+  "gitHead": "720642536863e65eda54f91d69eccebca4ac07d1"
 }

package/test-client.d.ts

@@ -1,13 +1,16 @@
 import { Client, QueryResult } from 'pg';
 import { PgConfig } from 'pg-env';
-type PgTestClientOpts = {
+import { AuthOptions, PgTestConnectionOptions } from '@launchql/types';
+export type PgTestClientOpts = {
     deferConnect?: boolean;
     trackConnect?: (p: Promise<any>) => void;
-};
+} & Partial<PgTestConnectionOptions>;
 export declare class PgTestClient {
     config: PgConfig;
     client: Client;
+    private opts;
     private ctxStmts;
+    private contextSettings;
     private _ended;
     private connectPromise;
     constructor(config: PgConfig, opts?: PgTestClientOpts);
@@ -20,6 +23,20 @@ export declare class PgTestClient {
     beforeEach(): Promise<void>;
     afterEach(): Promise<void>;
     setContext(ctx: Record<string, string | null>): void;
+    /**
+     * Set authentication context for the current session.
+     * Configures role and user ID using cascading defaults from options → opts.auth → RoleMapping.
+     */
+    auth(options?: AuthOptions): void;
+    /**
+     * Commit current transaction to make data visible to other connections, then start fresh transaction.
+     * Maintains test isolation by creating a savepoint and reapplying session context.
+     */
+    publish(): Promise<void>;
+    /**
+     * Clear all session context variables and reset to default anonymous role.
+     */
+    clearContext(): void;
     any<T = any>(query: string, values?: any[]): Promise<T[]>;
     one<T = any>(query: string, values?: any[]): Promise<T>;
     oneOrNone<T = any>(query: string, values?: any[]): Promise<T | null>;
@@ -30,4 +47,3 @@ export declare class PgTestClient {
     query<T = any>(query: string, values?: any[]): Promise<QueryResult<T>>;
     ctxQuery(): Promise<void>;
 }
-export {};

package/test-client.js

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PgTestClient = void 0;
 const pg_1 = require("pg");
+const roles_1 = require("./roles");
 class PgTestClient {
     config;
     client;
+    opts;
     ctxStmts = '';
+    contextSettings = {};
     _ended = false;
     connectPromise = null;
     constructor(config, opts = {}) {
+        this.opts = opts;
         this.config = config;
         this.client = new pg_1.Client({
             host: this.config.host,
@@ -59,12 +63,53 @@ class PgTestClient {
         await this.commit();
     }
     setContext(ctx) {
-        this.ctxStmts = Object.entries(ctx)
+        Object.assign(this.contextSettings, ctx);
+        this.ctxStmts = Object.entries(this.contextSettings)
             .map(([key, val]) => val === null
             ? `SELECT set_config('${key}', NULL, true);`
             : `SELECT set_config('${key}', '${val}', true);`)
             .join('\n');
     }
+    /**
+     * Set authentication context for the current session.
+     * Configures role and user ID using cascading defaults from options → opts.auth → RoleMapping.
+     */
+    auth(options = {}) {
+        const role = options.role ?? this.opts.auth?.role ?? (0, roles_1.getRoleName)('authenticated', this.opts);
+        const userIdKey = options.userIdKey ?? this.opts.auth?.userIdKey ?? 'jwt.claims.user_id';
+        const userId = options.userId ?? this.opts.auth?.userId ?? null;
+        this.setContext({
+            role,
+            [userIdKey]: userId !== null ? String(userId) : null
+        });
+    }
+    /**
+     * Commit current transaction to make data visible to other connections, then start fresh transaction.
+     * Maintains test isolation by creating a savepoint and reapplying session context.
+     */
+    async publish() {
+        await this.commit(); // make data visible to other sessions
+        await this.begin(); // fresh tx
+        await this.savepoint(); // keep rollback harness
+        await this.ctxQuery(); // reapply all setContext()
+    }
+    /**
+     * Clear all session context variables and reset to default anonymous role.
+     */
+    clearContext() {
+        const defaultRole = (0, roles_1.getRoleName)('anonymous', this.opts);
+        const nulledSettings = {};
+        Object.keys(this.contextSettings).forEach(key => {
+            nulledSettings[key] = null;
+        });
+        nulledSettings.role = defaultRole;
+        this.ctxStmts = Object.entries(nulledSettings)
+            .map(([key, val]) => val === null
+            ? `SELECT set_config('${key}', NULL, true);`
+            : `SELECT set_config('${key}', '${val}', true);`)
+            .join('\n');
+        this.contextSettings = { role: defaultRole };
+    }
     async any(query, values) {
         const result = await this.query(query, values);
         return result.rows;