@adonis-agora/durable 1.0.0-rc.14 → 1.0.0-rc.16

package/dist/stubs/database/migrations/create_durable_transport_tables.stub

@@ -1,8 +1,21 @@
 {{{
   exports({ to: app.migrationsPath(`${new Date().getTime()}_create_durable_transport_tables.ts`) })
 }}}
+import app from '@adonisjs/core/services/app'
 import { BaseSchema } from '@adonisjs/lucid/schema'
 
+/**
+ * The database schema the tables live in (a database on MySQL): the top-level
+ * \`schema\` of config/durable.ts, read when the migration runs (\`undefined\` uses the
+ * connection's current schema). If you set it on \`transports.db({ schema })\` (or on the queue
+ * transport's \`workerKeysSchema\`) instead, put that value here.
+ */
+const configured = app.config.get('durable.schema', undefined)
+const schema = typeof configured === 'string' ? configured : undefined
+
+/** \`name\` in {@link schema}: Knex quotes \`schema.table\` part by part. */
+const inSchema = (name: string) => (schema ? \`\${schema}.\${name}\` : name)
+
 /**
  * Transport tables for the @adonis-agora/durable \`db\` transport: the point-to-point work channels (tasks /
  * results / heartbeats / control) that let durable remote steps run cross-process over the database
@@ -12,7 +25,16 @@ import { BaseSchema } from '@adonisjs/lucid/schema'
  */
 export default class extends BaseSchema {
   async up() {
-    this.schema.createTable('durable_transport_tasks', (table) => {
+    if (schema) {
+      // Runs before the tables below (calls run in order); \`??\` quotes the name as an identifier.
+      this.defer(async (db) => {
+        await db.rawQuery(
+          db.dialect.name === 'mysql' ? 'create database if not exists ??' : 'create schema if not exists ??',
+          [schema]
+        )
+      })
+    }
+    this.schema.createTable(inSchema('durable_transport_tasks'), (table) => {
       table.string('step_id').primary()
       table.string('run_id').notNullable()
       table.integer('seq').notNullable()
@@ -33,7 +55,7 @@ export default class extends BaseSchema {
       table.index(['namespace', 'grp', 'claimed_at', 'created_at'], 'durable_transport_tasks_grp_idx')
     })
 
-    this.schema.createTable('durable_transport_results', (table) => {
+    this.schema.createTable(inSchema('durable_transport_results'), (table) => {
       table.string('step_id').primary()
       table.string('run_id').notNullable()
       table.integer('seq').notNullable()
@@ -49,7 +71,7 @@ export default class extends BaseSchema {
       table.index(['namespace', 'claimed_at', 'created_at'], 'durable_transport_results_idx')
     })
 
-    this.schema.createTable('durable_transport_heartbeats', (table) => {
+    this.schema.createTable(inSchema('durable_transport_heartbeats'), (table) => {
       table.increments('id').primary()
       table.string('run_id').notNullable()
       table.integer('seq').notNullable()
@@ -62,7 +84,7 @@ export default class extends BaseSchema {
       table.index(['namespace', 'claimed_at', 'created_at'], 'durable_transport_heartbeats_idx')
     })
 
-    this.schema.createTable('durable_transport_control', (table) => {
+    this.schema.createTable(inSchema('durable_transport_control'), (table) => {
       table.increments('id').primary()
       table.text('payload', 'longtext').notNullable()
       table.string('namespace').notNullable().defaultTo('default')
@@ -74,9 +96,9 @@ export default class extends BaseSchema {
   }
 
   async down() {
-    this.schema.dropTableIfExists('durable_transport_control')
-    this.schema.dropTableIfExists('durable_transport_heartbeats')
-    this.schema.dropTableIfExists('durable_transport_results')
-    this.schema.dropTableIfExists('durable_transport_tasks')
+    this.schema.dropTableIfExists(inSchema('durable_transport_control'))
+    this.schema.dropTableIfExists(inSchema('durable_transport_heartbeats'))
+    this.schema.dropTableIfExists(inSchema('durable_transport_results'))
+    this.schema.dropTableIfExists(inSchema('durable_transport_tasks'))
   }
 }

package/dist/stubs/database/migrations/create_durable_transport_worker_keys.stub

@@ -1,8 +1,21 @@
 {{{
   exports({ to: app.migrationsPath(`${new Date().getTime()}_create_durable_transport_worker_keys.ts`) })
 }}}
+import app from '@adonisjs/core/services/app'
 import { BaseSchema } from '@adonisjs/lucid/schema'
 
+/**
+ * The database schema the tables live in (a database on MySQL): the top-level
+ * \`schema\` of config/durable.ts, read when the migration runs (\`undefined\` uses the
+ * connection's current schema). If you set it on \`transports.db({ schema })\` (or on the queue
+ * transport's \`workerKeysSchema\`) instead, put that value here.
+ */
+const configured = app.config.get('durable.schema', undefined)
+const schema = typeof configured === 'string' ? configured : undefined
+
+/** \`name\` in {@link schema}: Knex quotes \`schema.table\` part by part. */
+const inSchema = (name: string) => (schema ? \`\${schema}.\${name}\` : name)
+
 /**
  * The worker advertisement keys for the @adonis-agora/durable \`db\` transport: the descriptor and
  * heartbeat a worker runtime publishes (what it serves, and that it is alive), each with an expiry so a
@@ -10,7 +23,16 @@ import { BaseSchema } from '@adonisjs/lucid/schema'
  */
 export default class extends BaseSchema {
   async up() {
-    this.schema.createTable('durable_transport_worker_keys', (table) => {
+    if (schema) {
+      // Runs before the tables below (calls run in order); \`??\` quotes the name as an identifier.
+      this.defer(async (db) => {
+        await db.rawQuery(
+          db.dialect.name === 'mysql' ? 'create database if not exists ??' : 'create schema if not exists ??',
+          [schema]
+        )
+      })
+    }
+    this.schema.createTable(inSchema('durable_transport_worker_keys'), (table) => {
       table.string('key', 512).primary()
       table.text('value', 'longtext').notNullable()
       table.bigInteger('expires_at').notNullable()
@@ -19,6 +41,6 @@ export default class extends BaseSchema {
   }
 
   async down() {
-    this.schema.dropTableIfExists('durable_transport_worker_keys')
+    this.schema.dropTableIfExists(inSchema('durable_transport_worker_keys'))
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonis-agora/durable",
-  "version": "1.0.0-rc.14",
+  "version": "1.0.0-rc.16",
   "description": "Durable cross-app workflows for AdonisJS — deterministic replay engine, AdonisJS binding, ace commands, dashboard, OpenTelemetry, Telescope, testing harness and Redis admission, all in one package. Part of the Agora ecosystem.",
   "license": "MIT",
   "repository": {