@dbos-inc/dbos-sdk 4.4.4-preview.gc90a14c7ef → 4.4.5-preview

package/dist/src/system_database.js

@@ -30,35 +30,35 @@ exports.DBOS_FUNCNAME_WRITESTREAM = 'DBOS.writeStream';
 exports.DBOS_FUNCNAME_CLOSESTREAM = 'DBOS.closeStream';
 exports.DEFAULT_POOL_SIZE = 10;
 exports.DBOS_STREAM_CLOSED_SENTINEL = '__DBOS_STREAM_CLOSED__';
-async function grantDbosSchemaPermissions(databaseUrl, roleName, logger) {
-    logger.info(`Granting permissions for DBOS schema to ${roleName}`);
+async function grantDbosSchemaPermissions(databaseUrl, roleName, logger, schemaName = 'dbos') {
+    logger.info(`Granting permissions for ${schemaName} schema to ${roleName}`);
     const client = new pg_1.Client((0, utils_2.getClientConfig)(databaseUrl));
     await client.connect();
     try {
-        // Grant usage on the dbos schema
-        const grantUsageSql = `GRANT USAGE ON SCHEMA dbos TO "${roleName}"`;
+        // Grant usage on the schema
+        const grantUsageSql = `GRANT USAGE ON SCHEMA "${schemaName}" TO "${roleName}"`;
         logger.info(grantUsageSql);
         await client.query(grantUsageSql);
-        // Grant all privileges on all existing tables in dbos schema (includes views)
-        const grantTablesSql = `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA dbos TO "${roleName}"`;
+        // Grant all privileges on all existing tables in schema (includes views)
+        const grantTablesSql = `GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA "${schemaName}" TO "${roleName}"`;
         logger.info(grantTablesSql);
         await client.query(grantTablesSql);
-        // Grant all privileges on all sequences in dbos schema
-        const grantSequencesSql = `GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA dbos TO "${roleName}"`;
+        // Grant all privileges on all sequences in schema
+        const grantSequencesSql = `GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA "${schemaName}" TO "${roleName}"`;
         logger.info(grantSequencesSql);
         await client.query(grantSequencesSql);
-        // Grant execute on all functions and procedures in dbos schema
-        const grantFunctionsSql = `GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA dbos TO "${roleName}"`;
+        // Grant execute on all functions and procedures in schema
+        const grantFunctionsSql = `GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA "${schemaName}" TO "${roleName}"`;
         logger.info(grantFunctionsSql);
         await client.query(grantFunctionsSql);
-        // Grant default privileges for future objects in dbos schema
-        const alterTablesSql = `ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT ALL ON TABLES TO "${roleName}"`;
+        // Grant default privileges for future objects in schema
+        const alterTablesSql = `ALTER DEFAULT PRIVILEGES IN SCHEMA "${schemaName}" GRANT ALL ON TABLES TO "${roleName}"`;
         logger.info(alterTablesSql);
         await client.query(alterTablesSql);
-        const alterSequencesSql = `ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT ALL ON SEQUENCES TO "${roleName}"`;
+        const alterSequencesSql = `ALTER DEFAULT PRIVILEGES IN SCHEMA "${schemaName}" GRANT ALL ON SEQUENCES TO "${roleName}"`;
         logger.info(alterSequencesSql);
         await client.query(alterSequencesSql);
-        const alterFunctionsSql = `ALTER DEFAULT PRIVILEGES IN SCHEMA dbos GRANT EXECUTE ON FUNCTIONS TO "${roleName}"`;
+        const alterFunctionsSql = `ALTER DEFAULT PRIVILEGES IN SCHEMA "${schemaName}" GRANT EXECUTE ON FUNCTIONS TO "${roleName}"`;
         logger.info(alterFunctionsSql);
         await client.query(alterFunctionsSql);
     }
@@ -71,7 +71,7 @@ async function grantDbosSchemaPermissions(databaseUrl, roleName, logger) {
     }
 }
 exports.grantDbosSchemaPermissions = grantDbosSchemaPermissions;
-async function ensureSystemDatabase(sysDbUrl, logger, debugMode = false, customPool) {
+async function ensureSystemDatabase(sysDbUrl, logger, debugMode = false, customPool, schemaName = 'dbos') {
     if (debugMode) {
         // Don't create anything in debug mode
         return;
@@ -100,7 +100,7 @@ async function ensureSystemDatabase(sysDbUrl, logger, debugMode = false, customP
         client = cconnect.client;
     }
     try {
-        await (0, migration_runner_1.runSysMigrationsPg)(client, migrations_1.allMigrations, {
+        await (0, migration_runner_1.runSysMigrationsPg)(client, (0, migrations_1.allMigrations)(schemaName), schemaName, {
             onWarn: (e) => logger.info(e),
         });
     }
@@ -148,9 +148,9 @@ class NotificationMap {
         }
     }
 }
-async function insertWorkflowStatus(client, initStatus) {
+async function insertWorkflowStatus(client, initStatus, schemaName) {
     try {
-        const { rows } = await client.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status (
+        const { rows } = await client.query(`INSERT INTO "${schemaName}".workflow_status (
         workflow_uuid,
         status,
         name,
@@ -224,11 +224,11 @@ async function insertWorkflowStatus(client, initStatus) {
         throw error;
     }
 }
-async function getWorkflowStatusValue(client, workflowID) {
-    const { rows } = await client.query(`SELECT status FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status WHERE workflow_uuid=$1`, [workflowID]);
+async function getWorkflowStatusValue(client, workflowID, schemaName) {
+    const { rows } = await client.query(`SELECT status FROM "${schemaName}".workflow_status WHERE workflow_uuid=$1`, [workflowID]);
     return rows.length === 0 ? undefined : rows[0].status;
 }
-async function updateWorkflowStatus(client, workflowID, status, options = {}) {
+async function updateWorkflowStatus(client, workflowID, status, schemaName, options = {}) {
     let setClause = `SET status=$2, updated_at=$3`;
     let whereClause = `WHERE workflow_uuid=$1`;
     const args = [workflowID, status, Date.now()];
@@ -262,15 +262,15 @@ async function updateWorkflowStatus(client, workflowID, status, options = {}) {
         const param = args.push(where.status);
         whereClause += ` AND status=$${param}`;
     }
-    const result = await client.query(`UPDATE ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status ${setClause} ${whereClause}`, args);
+    const result = await client.query(`UPDATE "${schemaName}".workflow_status ${setClause} ${whereClause}`, args);
     const throwOnFailure = options.throwOnFailure ?? true;
     if (throwOnFailure && result.rowCount !== 1) {
         throw new error_1.DBOSWorkflowConflictError(`Attempt to record transition of nonexistent workflow ${workflowID}`);
     }
 }
-async function recordOperationResult(client, workflowID, functionID, functionName, checkConflict, options = {}) {
+async function recordOperationResult(client, workflowID, functionID, functionName, checkConflict, schemaName, options = {}) {
     try {
-        await client.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.operation_outputs
+        await client.query(`INSERT INTO "${schemaName}".operation_outputs
        (workflow_uuid, function_id, output, error, function_name, child_workflow_id)
        VALUES ($1, $2, $3, $4, $5, $6)
        ${checkConflict ? '' : ' ON CONFLICT DO NOTHING'};`, [
@@ -462,6 +462,7 @@ class PostgresSystemDatabase {
     systemDatabaseUrl;
     logger;
     pool;
+    schemaName;
     /*
      * Generally, notifications are asynchronous.  One should:
      *  Subscribe to updates
@@ -490,9 +491,10 @@ class PostgresSystemDatabase {
     customPool = false;
     runningWorkflowMap = new Map(); // Map from workflowID to workflow promise
     workflowCancellationMap = new Map(); // Map from workflowID to its cancellation status.
-    constructor(systemDatabaseUrl, logger, sysDbPoolSize = exports.DEFAULT_POOL_SIZE, systemDatabasePool) {
+    constructor(systemDatabaseUrl, logger, sysDbPoolSize = exports.DEFAULT_POOL_SIZE, systemDatabasePool, schemaName = 'dbos') {
         this.systemDatabaseUrl = systemDatabaseUrl;
         this.logger = logger;
+        this.schemaName = schemaName;
         if (systemDatabasePool) {
             this.pool = systemDatabasePool;
             this.customPool = true;
@@ -516,7 +518,7 @@ class PostgresSystemDatabase {
         });
     }
     async init(debugMode = false) {
-        await ensureSystemDatabase(this.systemDatabaseUrl, this.logger, debugMode, this.customPool ? this.pool : undefined);
+        await ensureSystemDatabase(this.systemDatabaseUrl, this.logger, debugMode, this.customPool ? this.pool : undefined, this.schemaName);
         if (this.shouldUseDBNotifications) {
             await this.#listenForNotifications();
         }
@@ -539,7 +541,7 @@ class PostgresSystemDatabase {
         const client = await this.pool.connect();
         try {
             await client.query('BEGIN ISOLATION LEVEL READ COMMITTED');
-            const resRow = await insertWorkflowStatus(client, initStatus);
+            const resRow = await insertWorkflowStatus(client, initStatus, this.schemaName);
             if (resRow.name !== initStatus.workflowName) {
                 const msg = `Workflow already exists with a different function name: ${resRow.name}, but the provided function name is: ${initStatus.workflowName}`;
                 throw new error_1.DBOSConflictingWorkflowError(initStatus.workflowUUID, msg);
@@ -561,7 +563,7 @@ class PostgresSystemDatabase {
             // Thus, when this number becomes equal to `maxRetries + 1`, we should mark the workflow as `MAX_RECOVERY_ATTEMPTS_EXCEEDED`.
             const attempts = resRow.recovery_attempts;
             if (maxRetries && attempts > maxRetries + 1) {
-                await updateWorkflowStatus(client, initStatus.workflowUUID, workflow_1.StatusString.MAX_RECOVERY_ATTEMPTS_EXCEEDED, {
+                await updateWorkflowStatus(client, initStatus.workflowUUID, workflow_1.StatusString.MAX_RECOVERY_ATTEMPTS_EXCEEDED, this.schemaName, {
                     where: { status: workflow_1.StatusString.PENDING },
                     throwOnFailure: false,
                 });
@@ -584,7 +586,7 @@ class PostgresSystemDatabase {
     async recordWorkflowOutput(workflowID, status) {
         const client = await this.pool.connect();
         try {
-            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.SUCCESS, {
+            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.SUCCESS, this.schemaName, {
                 update: { output: status.output, resetDeduplicationID: true },
             });
         }
@@ -595,7 +597,7 @@ class PostgresSystemDatabase {
     async recordWorkflowError(workflowID, status) {
         const client = await this.pool.connect();
         try {
-            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.ERROR, {
+            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.ERROR, this.schemaName, {
                 update: { error: status.error, resetDeduplicationID: true },
             });
         }
@@ -605,7 +607,7 @@ class PostgresSystemDatabase {
     }
     async getPendingWorkflows(executorID, appVersion) {
         const getWorkflows = await this.pool.query(`SELECT workflow_uuid, queue_name 
-       FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status 
+       FROM "${this.schemaName}".workflow_status 
        WHERE status=$1 AND executor_id=$2 AND application_version=$3`, [workflow_1.StatusString.PENDING, executorID, appVersion]);
         return getWorkflows.rows.map((i) => ({
             workflowUUID: i.workflow_uuid,
@@ -615,7 +617,7 @@ class PostgresSystemDatabase {
     async #getOperationResultAndThrowIfCancelled(client, workflowID, functionID) {
         await this.#checkIfCanceled(client, workflowID);
         const { rows } = await client.query(`SELECT output, error, child_workflow_id, function_name
-       FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.operation_outputs
+       FROM "${this.schemaName}".operation_outputs
       WHERE workflow_uuid=$1 AND function_id=$2`, [workflowID, functionID]);
         if (rows.length === 0) {
             return undefined;
@@ -639,13 +641,13 @@ class PostgresSystemDatabase {
         }
     }
     async getAllOperationResults(workflowID) {
-        const { rows } = await this.pool.query(`SELECT * FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.operation_outputs WHERE workflow_uuid=$1`, [workflowID]);
+        const { rows } = await this.pool.query(`SELECT * FROM "${this.schemaName}".operation_outputs WHERE workflow_uuid=$1`, [workflowID]);
         return rows;
     }
     async recordOperationResult(workflowID, functionID, functionName, checkConflict, options = {}) {
         const client = await this.pool.connect();
         try {
-            await recordOperationResult(client, workflowID, functionID, functionName, checkConflict, options);
+            await recordOperationResult(client, workflowID, functionID, functionName, checkConflict, this.schemaName, options);
         }
         finally {
             client.release();
@@ -688,12 +690,12 @@ class PostgresSystemDatabase {
                 deduplicationID: undefined,
                 priority: 0,
                 queuePartitionKey: undefined,
-            });
+            }, this.schemaName);
             if (startStep > 0) {
-                const query = `INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.operation_outputs 
+                const query = `INSERT INTO "${this.schemaName}".operation_outputs 
           (workflow_uuid, function_id, output, error, function_name, child_workflow_id )
           SELECT $1 AS workflow_uuid, function_id, output, error, function_name, child_workflow_id
-          FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.operation_outputs
+          FROM "${this.schemaName}".operation_outputs
           WHERE workflow_uuid = $2 AND function_id < $3`;
                 await client.query(query, [newWorkflowID, workflowID, startStep]);
             }
@@ -717,7 +719,7 @@ class PostgresSystemDatabase {
             return result.output;
         }
         const output = await func();
-        await recordOperationResult(client, workflowID, functionID, functionName, true, { output });
+        await recordOperationResult(client, workflowID, functionID, functionName, true, this.schemaName, { output });
         return output;
     }
     async durableSleepms(workflowID, functionID, durationMS) {
@@ -757,7 +759,7 @@ class PostgresSystemDatabase {
                 endTimeMs = JSON.parse(res.output);
             }
             else {
-                await recordOperationResult(client, workflowID, functionID, exports.DBOS_FUNCNAME_SLEEP, false, {
+                await recordOperationResult(client, workflowID, functionID, exports.DBOS_FUNCNAME_SLEEP, false, this.schemaName, {
                     output: JSON.stringify(endTimeMs),
                 });
             }
@@ -777,7 +779,7 @@ class PostgresSystemDatabase {
         try {
             await client.query('BEGIN ISOLATION LEVEL READ COMMITTED');
             await this.#runAndRecordResult(client, exports.DBOS_FUNCNAME_SEND, workflowID, functionID, async () => {
-                await client.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.notifications (destination_uuid, topic, message) VALUES ($1, $2, $3);`, [destinationID, topic, message]);
+                await client.query(`INSERT INTO "${this.schemaName}".notifications (destination_uuid, topic, message) VALUES ($1, $2, $3);`, [destinationID, topic, message]);
                 return undefined;
             });
             await client.query('COMMIT');
@@ -823,7 +825,7 @@ class PostgresSystemDatabase {
             try {
                 await this.checkIfCanceled(workflowID);
                 // Check if the key is already in the DB, then wait for the notification if it isn't.
-                const initRecvRows = (await this.pool.query(`SELECT topic FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.notifications WHERE destination_uuid=$1 AND topic=$2;`, [workflowID, topic])).rows;
+                const initRecvRows = (await this.pool.query(`SELECT topic FROM "${this.schemaName}".notifications WHERE destination_uuid=$1 AND topic=$2;`, [workflowID, topic])).rows;
                 if (initRecvRows.length !== 0)
                     break;
                 const ct = Date.now();
@@ -864,14 +866,14 @@ class PostgresSystemDatabase {
             await client.query(`BEGIN ISOLATION LEVEL READ COMMITTED`);
             const finalRecvRows = (await client.query(`WITH oldest_entry AS (
         SELECT destination_uuid, topic, message, created_at_epoch_ms
-        FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.notifications
+        FROM "${this.schemaName}".notifications
         WHERE destination_uuid = $1
           AND topic = $2
         ORDER BY created_at_epoch_ms ASC
         LIMIT 1
        )
 
-        DELETE FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.notifications
+        DELETE FROM "${this.schemaName}".notifications
         USING oldest_entry
         WHERE notifications.destination_uuid = oldest_entry.destination_uuid
           AND notifications.topic = oldest_entry.topic
@@ -880,7 +882,9 @@ class PostgresSystemDatabase {
             if (finalRecvRows.length > 0) {
                 message = finalRecvRows[0].message;
             }
-            await recordOperationResult(client, workflowID, functionID, exports.DBOS_FUNCNAME_RECV, true, { output: message });
+            await recordOperationResult(client, workflowID, functionID, exports.DBOS_FUNCNAME_RECV, true, this.schemaName, {
+                output: message,
+            });
             await client.query(`COMMIT`);
         }
         catch (e) {
@@ -897,7 +901,7 @@ class PostgresSystemDatabase {
     async setWorkflowStatus(workflowID, status, resetRecoveryAttempts) {
         const client = await this.pool.connect();
         try {
-            await updateWorkflowStatus(client, workflowID, status, { update: { resetRecoveryAttempts } });
+            await updateWorkflowStatus(client, workflowID, status, this.schemaName, { update: { resetRecoveryAttempts } });
         }
         finally {
             client.release();
@@ -908,7 +912,7 @@ class PostgresSystemDatabase {
         try {
             await client.query('BEGIN ISOLATION LEVEL READ COMMITTED');
             await this.#runAndRecordResult(client, exports.DBOS_FUNCNAME_SETEVENT, workflowID, functionID, async () => {
-                await client.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_events (workflow_uuid, key, value)
+                await client.query(`INSERT INTO "${this.schemaName}".workflow_events (workflow_uuid, key, value)
              VALUES ($1, $2, $3)
              ON CONFLICT (workflow_uuid, key)
              DO UPDATE SET value = $3
@@ -960,7 +964,7 @@ class PostgresSystemDatabase {
                     await this.checkIfCanceled(callerWorkflow?.workflowID);
                 // Check if the key is already in the DB, then wait for the notification if it isn't.
                 const initRecvRows = (await this.pool.query(`SELECT key, value
-             FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_events
+             FROM "${this.schemaName}".workflow_events
              WHERE workflow_uuid=$1 AND key=$2;`, [workflowID, key])).rows;
                 if (initRecvRows.length > 0) {
                     value = initRecvRows[0].value;
@@ -1019,7 +1023,7 @@ class PostgresSystemDatabase {
         const client = await this.pool.connect();
         try {
             await client.query('BEGIN ISOLATION LEVEL READ COMMITTED');
-            const statusResult = await getWorkflowStatusValue(client, workflowID);
+            const statusResult = await getWorkflowStatusValue(client, workflowID, this.schemaName);
             if (!statusResult) {
                 throw new error_1.DBOSNonExistentWorkflowError(`Workflow ${workflowID} does not exist`);
             }
@@ -1030,7 +1034,7 @@ class PostgresSystemDatabase {
                 return;
             }
             // Set the workflow's status to CANCELLED and remove it from any queue it is on
-            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.CANCELLED, {
+            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.CANCELLED, this.schemaName, {
                 update: { queueName: null, resetDeduplicationID: true, resetStartedAtEpochMs: true },
             });
             await client.query('COMMIT');
@@ -1049,7 +1053,7 @@ class PostgresSystemDatabase {
         if (this.workflowCancellationMap.get(workflowID) === true) {
             throw new error_1.DBOSWorkflowCancelledError(workflowID);
         }
-        const statusValue = await getWorkflowStatusValue(client, workflowID);
+        const statusValue = await getWorkflowStatusValue(client, workflowID, this.schemaName);
         if (statusValue === workflow_1.StatusString.CANCELLED) {
             throw new error_1.DBOSWorkflowCancelledError(workflowID);
         }
@@ -1069,7 +1073,7 @@ class PostgresSystemDatabase {
         try {
             await client.query('BEGIN ISOLATION LEVEL REPEATABLE READ');
             // Check workflow status. If it is complete, do nothing.
-            const statusResult = await getWorkflowStatusValue(client, workflowID);
+            const statusResult = await getWorkflowStatusValue(client, workflowID, this.schemaName);
             if (!statusResult || statusResult === workflow_1.StatusString.SUCCESS || statusResult === workflow_1.StatusString.ERROR) {
                 await client.query('ROLLBACK');
                 if (!statusResult) {
@@ -1080,7 +1084,7 @@ class PostgresSystemDatabase {
                 return;
             }
             // Set the workflow's status to ENQUEUED and reset recovery attempts and deadline.
-            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.ENQUEUED, {
+            await updateWorkflowStatus(client, workflowID, workflow_1.StatusString.ENQUEUED, this.schemaName, {
                 update: {
                     queueName: utils_1.INTERNAL_QUEUE_NAME,
                     resetRecoveryAttempts: true,
@@ -1173,7 +1177,7 @@ class PostgresSystemDatabase {
                 if (callerID)
                     await this.checkIfCanceled(callerID);
                 try {
-                    const { rows } = await this.pool.query(`SELECT status, output, error FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status 
+                    const { rows } = await this.pool.query(`SELECT status, output, error FROM "${this.schemaName}".workflow_status 
              WHERE workflow_uuid=$1`, [workflowID]);
                     if (rows.length > 0) {
                         const status = rows[0].status;
@@ -1284,7 +1288,7 @@ class PostgresSystemDatabase {
     }
     // Event dispatcher queries / updates
     async getEventDispatchState(service, workflowName, key) {
-        const res = await this.pool.query(`SELECT * FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.event_dispatch_kv
+        const res = await this.pool.query(`SELECT * FROM "${this.schemaName}".event_dispatch_kv
        WHERE workflow_fn_name = $1 AND service_name = $2 AND key = $3;`, [workflowName, service, key]);
         if (res.rows.length === 0)
             return undefined;
@@ -1300,7 +1304,7 @@ class PostgresSystemDatabase {
         };
     }
     async upsertEventDispatchState(state) {
-        const res = await this.pool.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.event_dispatch_kv (
+        const res = await this.pool.query(`INSERT INTO "${this.schemaName}".event_dispatch_kv (
         service_name, workflow_fn_name, key, value, update_time, update_seq)
        VALUES ($1, $2, $3, $4, $5, $6)
        ON CONFLICT (service_name, workflow_fn_name, key)
@@ -1324,7 +1328,7 @@ class PostgresSystemDatabase {
         };
     }
     async listWorkflows(input) {
-        const schemaName = dbos_executor_1.DBOSExecutor.systemDBSchemaName;
+        const schemaName = this.schemaName;
         const selectColumns = [
             'workflow_uuid',
             'status',
@@ -1404,7 +1408,7 @@ class PostgresSystemDatabase {
         const offsetClause = input.offset ? `OFFSET ${input.offset}` : '';
         const query = `
       SELECT ${selectColumns.join(', ')}
-      FROM ${schemaName}.workflow_status
+      FROM "${schemaName}".workflow_status
       ${whereClause}
       ${orderClause}
       ${limitClause}
@@ -1414,7 +1418,7 @@ class PostgresSystemDatabase {
         return result.rows.map(mapWorkflowStatus);
     }
     async listQueuedWorkflows(input) {
-        const schemaName = dbos_executor_1.DBOSExecutor.systemDBSchemaName;
+        const schemaName = this.schemaName;
         const selectColumns = [
             'workflow_uuid',
             'status',
@@ -1479,7 +1483,7 @@ class PostgresSystemDatabase {
         const offsetClause = input.offset ? `OFFSET ${input.offset}` : '';
         const query = `
       SELECT ${selectColumns.join(', ')}
-      FROM ${schemaName}.workflow_status
+      FROM "${schemaName}".workflow_status
       ${whereClause}
       ${orderClause}
       ${limitClause}
@@ -1490,14 +1494,14 @@ class PostgresSystemDatabase {
     }
     async clearQueueAssignment(workflowID) {
         // Reset the status of the task from "PENDING" to "ENQUEUED"
-        const wqRes = await this.pool.query(`UPDATE ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+        const wqRes = await this.pool.query(`UPDATE "${this.schemaName}".workflow_status
         SET started_at_epoch_ms = NULL, status = $2
         WHERE workflow_uuid = $1 AND queue_name is NOT NULL AND status = $3`, [workflowID, workflow_1.StatusString.ENQUEUED, workflow_1.StatusString.PENDING]);
         // If no rows were affected, the workflow is not anymore in the queue or was already completed
         return (wqRes.rowCount ?? 0) > 0;
     }
     async getDeduplicatedWorkflow(queueName, deduplicationID) {
-        const { rows } = await this.pool.query(`SELECT workflow_uuid FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+        const { rows } = await this.pool.query(`SELECT workflow_uuid FROM "${this.schemaName}".workflow_status
        WHERE queue_name = $1 AND deduplication_id = $2`, [queueName, deduplicationID]);
         if (rows.length === 0) {
             return null;
@@ -1505,7 +1509,7 @@ class PostgresSystemDatabase {
         return rows[0].workflow_uuid;
     }
     async getQueuePartitions(queueName) {
-        const { rows } = await this.pool.query(`SELECT DISTINCT queue_partition_key FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+        const { rows } = await this.pool.query(`SELECT DISTINCT queue_partition_key FROM "${this.schemaName}".workflow_status
        WHERE queue_name = $1
          AND status = $2
          AND queue_partition_key IS NOT NULL`, [queueName, workflow_1.StatusString.ENQUEUED]);
@@ -1532,7 +1536,7 @@ class PostgresSystemDatabase {
             let numRecentQueries = 0;
             if (queue.rateLimit) {
                 const params = [queue.name, workflow_1.StatusString.ENQUEUED, startTimeMs - limiterPeriodMS, ...partitionParams];
-                const countResult = await client.query(`SELECT COUNT(*) FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+                const countResult = await client.query(`SELECT COUNT(*) FROM "${this.schemaName}".workflow_status
            WHERE queue_name = $1
              AND status <> $2
              AND started_at_epoch_ms > $3
@@ -1551,7 +1555,7 @@ class PostgresSystemDatabase {
                 // Count how many workflows on this queue are currently PENDING both locally and globally.
                 const params = [queue.name, workflow_1.StatusString.PENDING, ...partitionParams];
                 const runningTasksResult = await client.query(`SELECT executor_id, COUNT(*) as task_count
-           FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+           FROM "${this.schemaName}".workflow_status
            WHERE queue_name = $1 AND status = $2
              ${partitionFilter.replace('$PARTITION', '$3')}
            GROUP BY executor_id`, params);
@@ -1585,7 +1589,7 @@ class PostgresSystemDatabase {
             const selectParams = [workflow_1.StatusString.ENQUEUED, queue.name, appVersion, ...partitionParams];
             const selectQuery = `
         SELECT workflow_uuid
-        FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+        FROM "${this.schemaName}".workflow_status
         WHERE status = $1
           AND queue_name = $2
           AND (application_version IS NULL OR application_version = $3)
@@ -1604,7 +1608,7 @@ class PostgresSystemDatabase {
                     break;
                 }
                 // Start the functions by marking them as pending and updating their executor IDs
-                await client.query(`UPDATE ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+                await client.query(`UPDATE "${this.schemaName}".workflow_status
            SET status = $1,
                executor_id = $2,
                application_version = $3,
@@ -1634,7 +1638,7 @@ class PostgresSystemDatabase {
         try {
             await client.query('BEGIN ISOLATION LEVEL READ COMMITTED');
             // Find the maximum offset for this workflow_uuid and key combination
-            const maxOffsetResult = await client.query(`SELECT MAX("offset") FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.streams 
+            const maxOffsetResult = await client.query(`SELECT MAX("offset") FROM "${this.schemaName}".streams 
          WHERE workflow_uuid = $1 AND key = $2`, [workflowID, key]);
             // Next offset is max + 1, or 0 if no records exist
             const maxOffset = maxOffsetResult.rows[0].max;
@@ -1642,7 +1646,7 @@ class PostgresSystemDatabase {
             // Serialize the value before storing
             const serializedValue = JSON.stringify(value);
             // Insert the new stream entry
-            await client.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.streams (workflow_uuid, key, value, "offset")
+            await client.query(`INSERT INTO "${this.schemaName}".streams (workflow_uuid, key, value, "offset")
          VALUES ($1, $2, $3, $4)`, [workflowID, key, serializedValue, nextOffset]);
             await client.query('COMMIT');
         }
@@ -1662,7 +1666,7 @@ class PostgresSystemDatabase {
             const functionName = value === exports.DBOS_STREAM_CLOSED_SENTINEL ? exports.DBOS_FUNCNAME_CLOSESTREAM : exports.DBOS_FUNCNAME_WRITESTREAM;
             await this.#runAndRecordResult(client, functionName, workflowID, functionID, async () => {
                 // Find the maximum offset for this workflow_uuid and key combination
-                const maxOffsetResult = await client.query(`SELECT MAX("offset") FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.streams 
+                const maxOffsetResult = await client.query(`SELECT MAX("offset") FROM "${this.schemaName}".streams 
            WHERE workflow_uuid = $1 AND key = $2`, [workflowID, key]);
                 // Next offset is max + 1, or 0 if no records exist
                 const maxOffset = maxOffsetResult.rows[0].max;
@@ -1670,7 +1674,7 @@ class PostgresSystemDatabase {
                 // Serialize the value before storing
                 const serializedValue = JSON.stringify(value);
                 // Insert the new stream entry
-                await client.query(`INSERT INTO ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.streams (workflow_uuid, key, value, "offset")
+                await client.query(`INSERT INTO "${this.schemaName}".streams (workflow_uuid, key, value, "offset")
            VALUES ($1, $2, $3, $4)`, [workflowID, key, serializedValue, nextOffset]);
                 return undefined;
             });
@@ -1691,7 +1695,7 @@ class PostgresSystemDatabase {
     async readStream(workflowID, key, offset) {
         const client = await this.pool.connect();
         try {
-            const result = await client.query(`SELECT value FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.streams 
+            const result = await client.query(`SELECT value FROM "${this.schemaName}".streams 
          WHERE workflow_uuid = $1 AND key = $2 AND "offset" = $3`, [workflowID, key, offset]);
             if (result.rows.length === 0) {
                 throw new Error(`No value found for workflow_uuid=${workflowID}, key=${key}, offset=${offset}`);
@@ -1708,7 +1712,7 @@ class PostgresSystemDatabase {
         if (rowsThreshold !== undefined) {
             // Get the created_at timestamp of the rows_threshold newest row
             const result = await this.pool.query(`SELECT created_at
-         FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+         FROM "${this.schemaName}".workflow_status
          ORDER BY created_at DESC
          LIMIT 1 OFFSET $1`, [rowsThreshold - 1]);
             if (result.rows.length > 0) {
@@ -1723,7 +1727,7 @@ class PostgresSystemDatabase {
             return;
         }
         // Delete all workflows older than cutoff that are NOT PENDING or ENQUEUED
-        await this.pool.query(`DELETE FROM ${dbos_executor_1.DBOSExecutor.systemDBSchemaName}.workflow_status
+        await this.pool.query(`DELETE FROM "${this.schemaName}".workflow_status
        WHERE created_at < $1
          AND status NOT IN ($2, $3)`, [cutoffEpochTimestampMs, workflow_1.StatusString.PENDING, workflow_1.StatusString.ENQUEUED]);
         return;