@rocicorp/zero 0.12.2025012901 → 0.12.2025013000

package/out/zero-cache/src/server/multi/main.js

@@ -1,94 +1,9 @@
 import 'dotenv/config'; // Imports ENV variables from .env
-import { assert } from "../../../../shared/src/asserts.js";
-import { exitAfter, ProcessManager, runUntilKilled, } from "../../services/life-cycle.js";
-import { childWorker, parentWorker, singleProcessMode, } from "../../types/processes.js";
-import { orTimeout } from "../../types/timeout.js";
-import { createLogContext } from "../logging.js";
-import { getMultiZeroConfig } from "./config.js";
-import { getTaskID } from "./runtime.js";
-import { TenantDispatcher } from "./tenant-dispatcher.js";
-export default async function runWorker(parent, env) {
-    const startMs = Date.now();
-    const { config, env: baseEnv } = getMultiZeroConfig(env);
-    const lc = createLogContext(config, { worker: 'main' });
-    const processes = new ProcessManager(lc, parent ?? process);
-    const { port, changeStreamerPort = port + 1 } = config;
-    let { taskID } = config;
-    if (!taskID) {
-        taskID = await getTaskID(lc);
-        baseEnv['ZERO_TASK_ID'] = taskID;
-    }
-    lc.info?.(`starting task ${taskID}`);
-    const multiMode = config.tenants.length;
-    if (!multiMode) {
-        // Run a single tenant on main `port`, and skip the TenantDispatcher.
-        config.tenants.push({
-            id: '',
-            env: {
-                ['ZERO_PORT']: String(port),
-                ['ZERO_CVR_DB']: config.cvr.db,
-                ['ZERO_CHANGE_DB']: config.change.db,
-                ['ZERO_REPLICA_FILE']: config.replicaFile,
-            },
-        });
-    }
-    // In the multi-node configuration, determine if this process
-    // should be dispatching sync requests (i.e. by `host` / `port`),
-    // or change-streamer requests (i.e. by tenant `id`).
-    const runAsReplicationManager = config.numSyncWorkers === 0;
-    // Start the first tenant at (port + 2) unless explicitly
-    // overridden by its own ZERO_PORT ...
-    let tenantPort = port;
-    const tenants = config.tenants.map(tenant => {
-        const mergedEnv = {
-            ...process.env, // propagate all ENV variables from this process
-            ...baseEnv, // defaults
-            ['ZERO_TENANT_ID']: tenant.id,
-            ['ZERO_PORT']: String((tenantPort += 2)), // and bump the port by 2 thereafter.
-            ...tenant.env, // overrides
-        };
-        if (runAsReplicationManager) {
-            // Sanity-check. It doesn't make sense to run sync workers in the
-            // replication-manager.
-            assert(mergedEnv['ZERO_NUM_SYNC_WORKERS'] === '0', `Tenant ${tenant.id} cannot run sync workers in the replication-manager`);
-        }
-        const changeStreamerURI = mergedEnv['ZERO_CHANGE_STREAMER_URI'];
-        if (changeStreamerURI && multiMode) {
-            // Requests from the view-syncer to the replication-manager are
-            // delineated/dispatched by the tenant ID as the first path component.
-            mergedEnv['ZERO_CHANGE_STREAMER_URI'] += changeStreamerURI.endsWith('/')
-                ? tenant.id
-                : `/${tenant.id}`;
-        }
-        return { ...tenant, worker: childWorker('./server/main.ts', mergedEnv) };
-    });
-    for (const tenant of tenants) {
-        processes.addWorker(tenant.worker, 'user-facing', tenant.id);
-    }
-    const s = tenants.length > 1 ? 's' : '';
-    lc.info?.(`waiting for zero-cache${s} to be ready ...`);
-    if ((await orTimeout(processes.allWorkersReady(), 60_000)) === 'timed-out') {
-        lc.info?.(`timed out waiting for readiness (${Date.now() - startMs} ms)`);
-    }
-    else {
-        lc.info?.(`zero-cache${s} ready (${Date.now() - startMs} ms)`);
-    }
-    const mainServices = [];
-    if (multiMode) {
-        mainServices.push(new TenantDispatcher(lc, runAsReplicationManager, tenants, {
-            port: runAsReplicationManager ? changeStreamerPort : port,
-        }));
-    }
-    parent?.send(['ready', { ready: true }]);
-    try {
-        await runUntilKilled(lc, parent ?? process, ...mainServices);
-    }
-    catch (err) {
-        processes.logErrorAndExit(err, 'main');
-    }
-    await processes.done();
-}
+import { exitAfter } from "../../services/life-cycle.js";
+import { parentWorker, singleProcessMode } from "../../types/processes.js";
+import { runWorker } from "./run-worker.js";
 if (!singleProcessMode()) {
     void exitAfter(() => runWorker(parentWorker, process.env));
 }
+export default runWorker;
 //# sourceMappingURL=main.js.map

package/out/zero-cache/src/server/multi/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/main.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/main.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC,CAAC,kCAAkC;AAC1D,OAAO,EAAC,SAAS,EAAC,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAC,YAAY,EAAE,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,IAAI,CAAC,iBAAiB,EAAE,EAAE,CAAC;IACzB,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,eAAe,SAAS,CAAC"}

package/out/zero-cache/src/server/multi/run-worker.d.ts

@@ -0,0 +1,4 @@
+import 'dotenv/config';
+import { type Worker } from '../../types/processes.ts';
+export declare function runWorker(parent: Worker | null, env: NodeJS.ProcessEnv): Promise<void>;
+//# sourceMappingURL=run-worker.d.ts.map

package/out/zero-cache/src/server/multi/run-worker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-worker.d.ts","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/run-worker.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAIvB,OAAO,EAAc,KAAK,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAOlE,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,OAAO,CAAC,IAAI,CAAC,CA+Ff"}

package/out/zero-cache/src/server/multi/run-worker.js

@@ -0,0 +1,91 @@
+import 'dotenv/config'; // Imports ENV variables from .env
+import { assert } from "../../../../shared/src/asserts.js";
+import { ProcessManager, runUntilKilled } from "../../services/life-cycle.js";
+import { childWorker } from "../../types/processes.js";
+import { orTimeout } from "../../types/timeout.js";
+import { createLogContext } from "../logging.js";
+import { getMultiZeroConfig } from "./config.js";
+import { getTaskID } from "./runtime.js";
+import { TenantDispatcher } from "./tenant-dispatcher.js";
+export async function runWorker(parent, env) {
+    const startMs = Date.now();
+    const { config, env: baseEnv } = getMultiZeroConfig(env);
+    const lc = createLogContext(config, { worker: 'main' });
+    const processes = new ProcessManager(lc, parent ?? process);
+    const { port, changeStreamerPort = port + 1 } = config;
+    let { taskID } = config;
+    if (!taskID) {
+        taskID = await getTaskID(lc);
+        baseEnv['ZERO_TASK_ID'] = taskID;
+    }
+    lc.info?.(`starting task ${taskID}`);
+    const multiMode = config.tenants.length;
+    if (!multiMode) {
+        // Run a single tenant on main `port`, and skip the TenantDispatcher.
+        config.tenants.push({
+            id: '',
+            env: {
+                ['ZERO_PORT']: String(port),
+                ['ZERO_CVR_DB']: config.cvr.db,
+                ['ZERO_CHANGE_DB']: config.change.db,
+                ['ZERO_REPLICA_FILE']: config.replicaFile,
+            },
+        });
+    }
+    // In the multi-node configuration, determine if this process
+    // should be dispatching sync requests (i.e. by `host` / `port`),
+    // or change-streamer requests (i.e. by tenant `id`).
+    const runAsReplicationManager = config.numSyncWorkers === 0;
+    // Start the first tenant at (port + 2) unless explicitly
+    // overridden by its own ZERO_PORT ...
+    let tenantPort = port;
+    const tenants = config.tenants.map(tenant => {
+        const mergedEnv = {
+            ...process.env, // propagate all ENV variables from this process
+            ...baseEnv, // defaults
+            ['ZERO_TENANT_ID']: tenant.id,
+            ['ZERO_PORT']: String((tenantPort += 2)), // and bump the port by 2 thereafter.
+            ...tenant.env, // overrides
+        };
+        if (runAsReplicationManager) {
+            // Sanity-check. It doesn't make sense to run sync workers in the
+            // replication-manager.
+            assert(mergedEnv['ZERO_NUM_SYNC_WORKERS'] === '0', `Tenant ${tenant.id} cannot run sync workers in the replication-manager`);
+        }
+        const changeStreamerURI = mergedEnv['ZERO_CHANGE_STREAMER_URI'];
+        if (changeStreamerURI && multiMode) {
+            // Requests from the view-syncer to the replication-manager are
+            // delineated/dispatched by the tenant ID as the first path component.
+            mergedEnv['ZERO_CHANGE_STREAMER_URI'] += changeStreamerURI.endsWith('/')
+                ? tenant.id
+                : `/${tenant.id}`;
+        }
+        return { ...tenant, worker: childWorker('./server/main.ts', mergedEnv) };
+    });
+    for (const tenant of tenants) {
+        processes.addWorker(tenant.worker, 'user-facing', tenant.id);
+    }
+    const s = tenants.length > 1 ? 's' : '';
+    lc.info?.(`waiting for zero-cache${s} to be ready ...`);
+    if ((await orTimeout(processes.allWorkersReady(), 60_000)) === 'timed-out') {
+        lc.info?.(`timed out waiting for readiness (${Date.now() - startMs} ms)`);
+    }
+    else {
+        lc.info?.(`zero-cache${s} ready (${Date.now() - startMs} ms)`);
+    }
+    const mainServices = [];
+    if (multiMode) {
+        mainServices.push(new TenantDispatcher(lc, runAsReplicationManager, tenants, {
+            port: runAsReplicationManager ? changeStreamerPort : port,
+        }));
+    }
+    parent?.send(['ready', { ready: true }]);
+    try {
+        await runUntilKilled(lc, parent ?? process, ...mainServices);
+    }
+    catch (err) {
+        processes.logErrorAndExit(err, 'main');
+    }
+    await processes.done();
+}
+//# sourceMappingURL=run-worker.js.map

package/out/zero-cache/src/server/multi/run-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-worker.js","sourceRoot":"","sources":["../../../../../../zero-cache/src/server/multi/run-worker.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/server/syncer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AA2BA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAU/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA6Gf"}
+{"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AA2BA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAU/B,wBAA8B,SAAS,CACrC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA8Gf"}

package/out/zero-cache/src/server/syncer.js

@@ -77,7 +77,7 @@ export default async function runWorker(parent, env, ...args) {
             .withContext('component', 'view-syncer')
             .withContext('clientGroupID', id)
             .withContext('instance', randomID());
-        return new ViewSyncerService(logger, must(config.taskID, 'main must set --task-id'), id, config.shard.id, cvrDB, new PipelineDriver(logger, new Snapshotter(logger, replicaFile), operatorStorage.createClientGroupStorage(id), id), sub, drainCoordinator, permissions);
+        return new ViewSyncerService(logger, must(config.taskID, 'main must set --task-id'), id, config.shard.id, cvrDB, new PipelineDriver(logger, config.log, new Snapshotter(logger, replicaFile), operatorStorage.createClientGroupStorage(id), id), sub, drainCoordinator, permissions);
     };
     const mutagenFactory = (id) => new MutagenService(lc.withContext('component', 'mutagen').withContext('clientGroupID', id), config.shard.id, id, upstreamDB, config, schema, permissions);
     const syncer = new Syncer(lc, config, viewSyncerFactory, mutagenFactory, parent);

package/out/zero-cache/src/server/syncer.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/change-source/pg/change-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"change-source.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EACL,yBAAyB,EAG1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,uEAAuE,CAAC;AAc/E,OAAO,KAAK,EAEV,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAW,KAAK,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAO1E,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,wCAAwC,CAAC;AAYhD,OAAO,EAAkB,KAAK,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAI3E,OAAO,EAAqB,KAAK,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAQ/E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAMnD;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;IAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CA4C7E;AA+ND,qBAAa,KAAK;;gBAIJ,OAAO,EAAE,yBAAyB;IAI9C,SAAS;IAiBT,GAAG,CAAC,SAAS,EAAE,WAAW;CAa3B;AAoZD,wBAAgB,gBAAgB,CAC9B,CAAC,EAAE,eAAe,EAClB,CAAC,EAAE,eAAe,EAClB,EAAE,CAAC,EAAE,UAAU,WAchB;AAMD,wBAAgB,eAAe,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,WAsB3E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,eAAe,WAkB1E;AAwBD,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,QAAQ,CAAC,IAAI,kCAAkC;;CAOhD"}
+{"version":3,"file":"change-source.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-source/pg/change-source.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EACL,yBAAyB,EAG1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAEV,eAAe,EAChB,MAAM,uEAAuE,CAAC;AAc/E,OAAO,KAAK,EAEV,kBAAkB,EAEnB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAW,KAAK,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAO1E,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,wCAAwC,CAAC;AAYhD,OAAO,EAAkB,KAAK,kBAAkB,EAAC,MAAM,mBAAmB,CAAC;AAI3E,OAAO,EAAqB,KAAK,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAQ/E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAMnD;;;;GAIG;AACH,wBAAsB,8BAA8B,CAClD,EAAE,EAAE,UAAU,EACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,kBAAkB,GAC9B,OAAO,CAAC;IAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAAC,YAAY,EAAE,YAAY,CAAA;CAAC,CAAC,CA4C7E;AAmOD,qBAAa,KAAK;;gBAIJ,OAAO,EAAE,yBAAyB;IAI9C,SAAS;IAiBT,GAAG,CAAC,SAAS,EAAE,WAAW;CAa3B;AAkWD,wBAAgB,gBAAgB,CAC9B,CAAC,EAAE,eAAe,EAClB,CAAC,EAAE,eAAe,EAClB,EAAE,CAAC,EAAE,UAAU,WAchB;AAMD,wBAAgB,eAAe,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,kBAAkB,WAuB3E;AAED,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,kBAAkB,EAAE,CAAC,EAAE,eAAe,WAkB1E;AAoCD,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,QAAQ,CAAC,IAAI,kCAAkC;;CAOhD"}

package/out/zero-cache/src/services/change-source/pg/change-source.js

@@ -98,11 +98,10 @@ class PostgresChangeSource {
     async startStream(clientWatermark) {
         const db = pgClient(this.#lc, this.#upstreamUri);
         const slot = replicationSlot(this.#shardID);
-        const clientStart = oneAfter(clientWatermark);
         try {
             await this.#stopExistingReplicationSlotSubscriber(db, slot);
             const config = await getInternalShardConfig(db, this.#shardID);
-            this.#lc.info?.(`starting replication stream @${slot}`);
+            this.#lc.info?.(`starting replication stream@${slot}`);
             // Enabling ssl according to the logic in:
             // https://github.com/brianc/node-postgres/blob/95d7e620ef8b51743b4cbca05dd3c3ce858ecea7/packages/pg-connection-string/index.js#L90
             const url = new URL(this.#upstreamUri);
@@ -114,7 +113,7 @@ class PostgresChangeSource {
                     // Unlike the postgres.js client, the pg client does not have an option to
                     // only use SSL if the server supports it. We achieve it manually by
                     // trying SSL first, and then falling back to connecting without SSL.
-                    return await this.#startStream(slot, clientStart, config, useSSL);
+                    return await this.#startStream(slot, clientWatermark, config, useSSL);
                 }
                 catch (e) {
                     if (e instanceof SSLUnsupportedError) {
@@ -144,7 +143,7 @@ class PostgresChangeSource {
             await db.end();
         }
     }
-    async #startStream(slot, clientStart, shardConfig, useSSL) {
+    async #startStream(slot, clientWatermark, shardConfig, useSSL) {
         const changes = Subscription.create({
             cleanup: () => service.stop(),
         });
@@ -200,6 +199,7 @@ class PostgresChangeSource {
         }))
             .on('error', handleError);
         acker = new Acker(service);
+        const clientStart = oneAfter(clientWatermark);
         service
             .subscribe(new PgoutputPlugin({
             protoVersion: 1,
@@ -208,7 +208,8 @@ class PostgresChangeSource {
         }), slot, fromLexiVersion(clientStart))
             .then(() => changes.cancel(), handleError);
         await started;
-        this.#lc.info?.(`started replication stream@${slot}`);
+        const { replicaVersion } = this.#replicationConfig;
+        this.#lc.info?.(`started replication stream@${slot} from ${clientWatermark} (replicaVersion: ${replicaVersion})`);
         return {
             changes,
             acks: { push: status => acker.ack(status[2].watermark) },
@@ -320,9 +321,13 @@ class ChangeMaker {
                 return [
                     ['begin', msg, { commitWatermark: toLexiVersion(must(msg.commitLsn)) }],
                 ];
-            case 'delete':
-                assert(msg.key);
-                return [['data', msg]];
+            case 'delete': {
+                const key = msg.key ?? msg.old;
+                if (!key) {
+                    throw new Error(`Invalid DELETE msg (missing key): ${stringify(msg)}`);
+                }
+                return [['data', msg.key ? msg : { ...msg, key }]];
+            }
             case 'insert':
             case 'update':
             case 'truncate':
@@ -386,10 +391,18 @@ class ChangeMaker {
      * but SQLite will error instead (https://sqlite.org/forum/forumpost/2e62dba69f?t=c&hist).
      * The current workaround is to drop indexes first.
      *
-     * More generally, the order of replicating DDL updates is:
+     * Also note that although it should not be possible to both rename and
+     * add/drop tables/columns in a single statement, the operations are
+     * ordered to handle that possibility, by always dropping old entities,
+     * then modifying kept entities, and then adding new entities.
+     *
+     * Thus, the order of replicating DDL updates is:
      * - drop indexes
-     * - alter tables
      * - drop tables
+     * - alter tables
+     *   - drop columns
+     *   - alter columns
+     *   - add columns
      * - create tables
      * - create indexes
      *
@@ -399,137 +412,87 @@ class ChangeMaker {
      * the type of a column that's indexed.
      */
     #makeSchemaChanges(preSchema, update) {
-        const [prevTables, prevIndexes] = specsByName(preSchema);
-        const [nextTables, nextIndexes] = specsByName(update.schema);
-        const { tag } = update.event;
+        const [prevTbl, prevIdx] = specsByID(preSchema);
+        const [nextTbl, nextIdx] = specsByID(update.schema);
         const changes = [];
         // Validate the new table schemas
-        for (const table of nextTables.values()) {
+        for (const table of nextTbl.values()) {
             validate(this.#lc, this.#shardID, table);
         }
-        const [dropped, created] = symmetricDifferences(prevIndexes, nextIndexes);
-        // Drop indexes first so that allow dropping dependent objects.
-        for (const id of dropped) {
-            const { schema, name } = must(prevIndexes.get(id));
+        const [droppedIdx, createdIdx] = symmetricDifferences(prevIdx, nextIdx);
+        for (const id of droppedIdx) {
+            const { schema, name } = must(prevIdx.get(id));
             changes.push({ tag: 'drop-index', id: { schema, name } });
         }
-        if (tag === 'ALTER PUBLICATION') {
-            const tables = intersection(prevTables, nextTables);
-            for (const id of tables) {
-                changes.push(...this.#getAddedOrDroppedColumnChanges(must(prevTables.get(id)), must(nextTables.get(id))));
-            }
+        // DROP
+        const [droppedTbl, createdTbl] = symmetricDifferences(prevTbl, nextTbl);
+        for (const id of droppedTbl) {
+            const { schema, name } = must(prevTbl.get(id));
+            changes.push({ tag: 'drop-table', id: { schema, name } });
         }
-        else if (tag === 'ALTER TABLE') {
-            const altered = idString(update.event.table);
-            const table = must(nextTables.get(altered));
-            const prevTable = prevTables.get(altered);
-            if (!prevTable) {
-                // table rename. Find the old name.
-                let old;
-                for (const [id, { schema, name }] of prevTables.entries()) {
-                    if (!nextTables.has(id)) {
-                        old = { schema, name };
-                        break;
-                    }
-                }
-                if (!old) {
-                    throw new Error(`can't find previous table: ${stringify(update)}`);
-                }
-                changes.push({ tag: 'rename-table', old, new: table });
-            }
-            else {
-                changes.push(...this.#getSingleColumnChange(prevTable, table));
-            }
+        // ALTER
+        const tables = intersection(prevTbl, nextTbl);
+        for (const id of tables) {
+            changes.push(...this.#getTableChanges(must(prevTbl.get(id)), must(nextTbl.get(id))));
         }
-        // Added/dropped tables are handled in the same way for most DDL updates, with
-        // the exception being `ALTER TABLE`, for which a table rename should not be
-        // confused as a drop + add.
-        if (tag !== 'ALTER TABLE') {
-            const [dropped, created] = symmetricDifferences(prevTables, nextTables);
-            for (const id of dropped) {
-                const { schema, name } = must(prevTables.get(id));
-                changes.push({ tag: 'drop-table', id: { schema, name } });
-            }
-            for (const id of created) {
-                const spec = must(nextTables.get(id));
-                changes.push({ tag: 'create-table', spec });
-            }
+        // CREATE
+        for (const id of createdTbl) {
+            const spec = must(nextTbl.get(id));
+            changes.push({ tag: 'create-table', spec });
         }
         // Add indexes last since they may reference tables / columns that need
         // to be created first.
-        for (const id of created) {
-            const spec = must(nextIndexes.get(id));
+        for (const id of createdIdx) {
+            const spec = must(nextIdx.get(id));
             changes.push({ tag: 'create-index', spec });
         }
         return changes;
     }
-    // ALTER PUBLICATION can only add and drop columns, but never change them.
-    #getAddedOrDroppedColumnChanges(oldTable, newTable) {
-        const table = { schema: newTable.schema, name: newTable.name };
-        const [dropped, added] = symmetricDifferences(new Set(Object.keys(oldTable.columns)), new Set(Object.keys(newTable.columns)));
+    #getTableChanges(oldTable, newTable) {
         const changes = [];
-        for (const column of dropped) {
-            changes.push({ tag: 'drop-column', table, column });
-        }
-        for (const name of added) {
+        if (oldTable.schema !== newTable.schema ||
+            oldTable.name !== newTable.name) {
             changes.push({
-                tag: 'add-column',
-                table,
-                column: { name, spec: newTable.columns[name] },
+                tag: 'rename-table',
+                old: { schema: oldTable.schema, name: oldTable.name },
+                new: { schema: newTable.schema, name: newTable.name },
             });
         }
-        return changes;
-    }
-    // ALTER TABLE can add, drop, or change/rename a single column.
-    #getSingleColumnChange(oldTable, newTable) {
         const table = { schema: newTable.schema, name: newTable.name };
-        const [d, a] = symmetricDifferences(new Set(Object.keys(oldTable.columns)), new Set(Object.keys(newTable.columns)));
-        const dropped = [...d];
-        const added = [...a];
-        assert(dropped.length <= 1 && added.length <= 1, `too many dropped [${[dropped]}] or added [${[added]}] columns`);
-        if (dropped.length === 1 && added.length === 1) {
-            const oldName = dropped[0];
-            const newName = added[0];
-            return [
-                {
-                    tag: 'update-column',
-                    table,
-                    old: { name: oldName, spec: oldTable.columns[oldName] },
-                    new: { name: newName, spec: newTable.columns[newName] },
-                },
-            ];
-        }
-        else if (added.length) {
-            const name = added[0];
-            return [
-                {
-                    tag: 'add-column',
-                    table,
-                    column: { name, spec: newTable.columns[name] },
-                },
-            ];
-        }
-        else if (dropped.length) {
-            return [{ tag: 'drop-column', table, column: dropped[0] }];
+        const oldColumns = columnsByID(oldTable.columns);
+        const newColumns = columnsByID(newTable.columns);
+        // DROP
+        const [dropped, added] = symmetricDifferences(oldColumns, newColumns);
+        for (const id of dropped) {
+            const { name: column } = must(oldColumns.get(id));
+            changes.push({ tag: 'drop-column', table, column });
         }
-        // Not a rename, add, or drop. Find the column with a relevant update.
-        for (const [name, oldSpec] of Object.entries(oldTable.columns)) {
-            const newSpec = newTable.columns[name];
-            // Besides the name, we only care about the data type and not null.
-            // Default values and other constraints are not relevant.
-            if (oldSpec.dataType !== newSpec.dataType ||
+        // ALTER
+        const both = intersection(oldColumns, newColumns);
+        for (const id of both) {
+            const { name: oldName, ...oldSpec } = must(oldColumns.get(id));
+            const { name: newName, ...newSpec } = must(newColumns.get(id));
+            // The three things that we care about are:
+            // 1. name
+            // 2. type
+            // 3. not-null
+            if (oldName !== newName ||
+                oldSpec.dataType !== newSpec.dataType ||
                 oldSpec.notNull !== newSpec.notNull) {
-                return [
-                    {
-                        tag: 'update-column',
-                        table,
-                        old: { name, spec: oldSpec },
-                        new: { name, spec: newSpec },
-                    },
-                ];
+                changes.push({
+                    tag: 'update-column',
+                    table,
+                    old: { name: oldName, spec: oldSpec },
+                    new: { name: newName, spec: newSpec },
+                });
             }
         }
-        return [];
+        // ADD
+        for (const id of added) {
+            const { name, ...spec } = must(newColumns.get(id));
+            changes.push({ tag: 'add-column', table, column: { name, spec } });
+        }
+        return changes;
     }
     #parseReplicationEvent(content) {
         const str = content instanceof Buffer
@@ -611,7 +574,8 @@ export function tablesDifferent(a, b) {
             const [bname, bcol] = bcols[i];
             return (aname !== bname ||
                 acol.pos !== bcol.pos ||
-                acol.typeOID !== bcol.typeOID);
+                acol.typeOID !== bcol.typeOID ||
+                acol.notNull !== bcol.notNull);
         }));
 }
 export function relationDifferent(a, b) {
@@ -639,14 +603,23 @@ function translateError(e) {
     return e;
 }
 const idString = (id) => `${id.schema}.${id.name}`;
-function specsByName(published) {
+function specsByID(published) {
     return [
         // It would have been nice to use a CustomKeyMap here, but we rely on set-utils
         // operations which use plain Sets.
-        new Map(published.tables.map(t => [idString(t), t])),
+        new Map(published.tables.map(t => [t.oid, t])),
         new Map(published.indexes.map(i => [idString(i), i])),
     ];
 }
+function columnsByID(columns) {
+    const colsByID = new Map();
+    for (const [name, spec] of Object.entries(columns)) {
+        // The `pos` field is the `attnum` in `pg_attribute`, which is a stable
+        // identifier for the column in this table (i.e. never reused).
+        colsByID.set(spec.pos, { ...spec, name });
+    }
+    return colsByID;
+}
 class SSLUnsupportedError extends Error {
 }
 export class UnsupportedSchemaChangeError extends Error {