@rocicorp/zero 0.2.2024101101 → 0.3.2024102500

package/out/zero-cache/src/services/change-streamer/pg/schema/published.js

@@ -1,14 +1,7 @@
 import { literal } from 'pg-format';
 import { equals } from '../../../../../../shared/src/set-utils.js';
 import * as v from '../../../../../../shared/src/valita.js';
-import { APP_PUBLICATION_PREFIX, INTERNAL_PUBLICATION_PREFIX } from './zero.js';
-function restrictTo(publications) {
-    return publications !== undefined
-        ? `pb.pubname IN (${literal(publications)})`
-        : `( STARTS_WITH(pb.pubname, ${literal(APP_PUBLICATION_PREFIX)})
-      OR STARTS_WITH(pb.pubname, ${literal(INTERNAL_PUBLICATION_PREFIX)}) )`;
-}
-export function publishedTableQuery(publications, join = '') {
+export function publishedTableQuery(publications) {
     return `
 WITH published_columns AS (SELECT 
   nspname AS "schema", 
@@ -32,10 +25,9 @@ JOIN pg_publication_tables as pb ON
   pb.schemaname = nspname AND 
   pb.tablename = pc.relname AND
   attname = ANY(pb.attnames)
-${join}
 LEFT JOIN pg_constraint pk ON pk.contype = 'p' AND pk.connamespace = relnamespace AND pk.conrelid = attrelid
 LEFT JOIN pg_attrdef pd ON pd.adrelid = attrelid AND pd.adnum = attnum
-WHERE ${restrictTo(publications)}
+WHERE pb.pubname IN (${literal(publications)})
 ORDER BY nspname, pc.relname),
 
 tables AS (SELECT json_build_object(
@@ -74,7 +66,7 @@ tables AS (SELECT json_build_object(
 SELECT COALESCE(json_agg("table"), '[]'::json) as "tables" FROM tables
   `;
 }
-export function indexDefinitionsQuery(publications, join = '') {
+export function indexDefinitionsQuery(publications) {
     // Note: pg_attribute contains column names for tables and for indexes.
     // However, the latter does not get updated when a column in a table is
     // renamed.
@@ -84,12 +76,16 @@ export function indexDefinitionsQuery(publications, join = '') {
     // To address this, the pg_attribute rows are looked up for the index's
     // table rather than the index itself, using the pg_index.indkey array
     // to determine the set and order of columns to include.
+    //
+    // Note: The first bit of indoption is 1 for DESC and 0 for ASC:
+    // https://github.com/postgres/postgres/blob/4e1fad37872e49a711adad5d9870516e5c71a375/src/include/catalog/pg_index.h#L89
     return `
   WITH indexed_columns AS (SELECT
-      pg_indexes.schemaname as "schemaName",
+      pg_indexes.schemaname as "schema",
       pg_indexes.tablename as "tableName",
       pg_indexes.indexname as "name",
       index_column.name as "col",
+      CASE WHEN pg_index.indoption[index_column.pos-1] & 1 = 1 THEN 'DESC' ELSE 'ASC' END as "dir",
       pg_index.indisunique as "unique"
     FROM pg_indexes
     JOIN pg_namespace ON pg_indexes.schemaname = pg_namespace.nspname
@@ -105,9 +101,8 @@ export function indexDefinitionsQuery(publications, join = '') {
         FROM UNNEST(pg_index.indkey) WITH ORDINALITY as col(table_pos, index_pos)
         JOIN pg_attribute ON attrelid = pg_index.indrelid AND attnum = col.table_pos
     ) AS index_column ON true
-    ${join}
     LEFT JOIN pg_constraint ON pg_constraint.conindid = pc.oid
-    WHERE ${restrictTo(publications)}
+    WHERE pb.pubname IN (${literal(publications)})
       AND pg_constraint.contype is distinct from 'p'
       AND pg_constraint.contype is distinct from 'f'
     ORDER BY
@@ -117,13 +112,13 @@ export function indexDefinitionsQuery(publications, join = '') {
       index_column.pos ASC),
   
     indexes AS (SELECT json_build_object(
-      'schemaName', "schemaName",
+      'schema', "schema",
       'tableName', "tableName",
       'name', "name",
       'unique', "unique",
-      'columns', json_agg("col")
+      'columns', json_object_agg(DISTINCT "col", "dir")
     ) AS index FROM indexed_columns 
-      GROUP BY "schemaName", "tableName", "name", "unique")
+      GROUP BY "schema", "tableName", "name", "unique")
 
     SELECT COALESCE(json_agg("index"), '[]'::json) as "indexes" FROM indexes
   `;
@@ -148,11 +143,11 @@ export async function getPublicationInfo(sql, publications) {
     tablename AS "table", 
     json_object_agg(pubname, attnames) AS "publications"
     FROM pg_publication_tables pb
-    WHERE ${restrictTo(publications)}
+    WHERE pb.pubname IN (${literal(publications)})
     GROUP BY schemaname, tablename;
 
   SELECT ${Object.keys(publicationSchema.shape).join(',')} FROM pg_publication pb
-    WHERE ${restrictTo(publications)}
+    WHERE pb.pubname IN (${literal(publications)})
     ORDER BY pubname;
 
   ${publishedTableQuery(publications)};

package/out/zero-cache/src/services/change-streamer/pg/schema/published.js.map

@@ -1 +1 @@
-{"version":3,"file":"published.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/published.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,MAAM,EAAC,MAAM,2CAA2C,CAAC;AACjE,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAE5D,OAAO,EAAC,sBAAsB,EAAE,2BAA2B,EAAC,MAAM,WAAW,CAAC;AAM9E,SAAS,UAAU,CAAC,YAAkC;IACpD,OAAO,YAAY,KAAK,SAAS;QAC/B,CAAC,CAAC,kBAAkB,OAAO,CAAC,YAAY,CAAC,GAAG;QAC5C,CAAC,CAAC,6BAA6B,OAAO,CAAC,sBAAsB,CAAC;mCAC/B,OAAO,CAAC,2BAA2B,CAAC,KAAK,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,YAAkC,EAClC,IAAI,GAAG,EAAE;IAET,OAAO;;;;;;;;;;;;;;;;;;;;;;;EAuBP,IAAI;;;QAGE,UAAU,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqC7B,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,qBAAqB,CACnC,YAAkC,EAClC,IAAI,GAAG,EAAE;IAET,uEAAuE;IACvE,uEAAuE;IACvE,WAAW;IACX,EAAE;IACF,gGAAgG;IAChG,EAAE;IACF,uEAAuE;IACvE,sEAAsE;IACtE,wDAAwD;IACxD,OAAO;;;;;;;;;;;;;;;;;;;;;MAqBH,IAAI;;YAEE,UAAU,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;GAmBjC,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAU5D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAiB,EACjB,YAAuB;IAEvB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;;;;;;YAMtB,UAAU,CAAC,YAAY,CAAC;;;WAGzB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,IAAI,CAChD,GAAG,CACJ;YACS,UAAU,CAAC,YAAY,CAAC;;;IAGhC,mBAAmB,CAAC,YAAY,CAAC;;IAEjC,qBAAqB,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;IAED,wEAAwE;IACxE,0CAA0C;IAC1C,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAI9B,CAAC;IACJ,KAAK,MAAM,EAAC,KAAK,EAAE,YAAY,EAAC,IAAI,gBAAgB,EAAE,CAAC;QACrD,IAAI,QAAqB,CAAC;QAC1B,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE;YACvD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CACb,SAAS,KAAK,yCAAyC;oBACrD,GAAG,QAAQ;iBACZ,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,CACvB,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,wBAAwB,CAAC;QAC1D,MAAM,EAAG,MAAM,CAAC,CAAC,CAAiC,CAAC,CAAC,CAAC,CAAC,MAAM;QAC5D,OAAO,EAAG,MAAM,CAAC,CAAC,CAAmC,CAAC,CAAC,CAAC,CAAC,OAAO;KACjE,CAAC;AACJ,CAAC"}
+{"version":3,"file":"published.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/published.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAElC,OAAO,EAAC,MAAM,EAAC,MAAM,2CAA2C,CAAC;AACjE,OAAO,KAAK,CAAC,MAAM,wCAAwC,CAAC;AAO5D,MAAM,UAAU,mBAAmB,CAAC,YAAsB;IACxD,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;uBAyBc,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCzC,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,qBAAqB,CAAC,YAAsB;IAC1D,uEAAuE;IACvE,uEAAuE;IACvE,WAAW;IACX,EAAE;IACF,gGAAgG;IAChG,EAAE;IACF,uEAAuE;IACvE,sEAAsE;IACtE,wDAAwD;IACxD,EAAE;IACF,gEAAgE;IAChE,wHAAwH;IACxH,OAAO;;;;;;;;;;;;;;;;;;;;;;;2BAuBkB,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;GAmB7C,CAAC;AACJ,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE;IACtB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;CACzB,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;AAU5D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAiB,EACjB,YAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC;;;;;;2BAMP,OAAO,CAAC,YAAY,CAAC;;;WAGrC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,IAAI,CAChD,GAAG,CACJ;2BACwB,OAAO,CAAC,YAAY,CAAC;;;IAG5C,mBAAmB,CAAC,YAAY,CAAC;;IAEjC,qBAAqB,CAAC,YAAY,CAAC;CACtC,CAAC,CAAC;IAED,wEAAwE;IACxE,0CAA0C;IAC1C,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAI9B,CAAC;IACJ,KAAK,MAAM,EAAC,KAAK,EAAE,YAAY,EAAC,IAAI,gBAAgB,EAAE,CAAC;QACrD,IAAI,QAAqB,CAAC;QAC1B,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,EAAE;YACvD,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACZ,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC;iBAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CACb,SAAS,KAAK,yCAAyC;oBACrD,GAAG,QAAQ;iBACZ,SAAS,CAAC,GAAG,IAAI,CAAC,GAAG,CACvB,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,wBAAwB,CAAC;QAC1D,MAAM,EAAG,MAAM,CAAC,CAAC,CAAiC,CAAC,CAAC,CAAC,CAAC,MAAM;QAC5D,OAAO,EAAG,MAAM,CAAC,CAAC,CAAmC,CAAC,CAAC,CAAC,CAAC,OAAO;KACjE,CAAC;AACJ,CAAC"}

package/out/zero-cache/src/services/change-streamer/pg/schema/shard.d.ts

@@ -0,0 +1,17 @@
+import type { LogContext } from '@rocicorp/logger';
+import type { PostgresDB, PostgresTransaction } from '../../../../types/pg.js';
+import type { ShardConfig } from '../shard-config.js';
+export declare function append(shardID: string): (name: string) => string;
+export declare function schemaFor(shardID: string): string;
+export declare function unescapedSchema(shardID: string): string;
+export declare const APP_PUBLICATION_PREFIX = "zero_";
+export declare const INTERNAL_PUBLICATION_PREFIX = "_zero_";
+export declare function getShardConfig(db: PostgresDB, shardID: string): Promise<{
+    publications: string[];
+}>;
+/**
+ * Sets up and returns all publications (including internal ones) for
+ * the given shard.
+ */
+export declare function setupTablesAndReplication(lc: LogContext, tx: PostgresTransaction, { id, publications }: ShardConfig): Promise<void>;
+//# sourceMappingURL=shard.d.ts.map

package/out/zero-cache/src/services/change-streamer/pg/schema/shard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shard.d.ts","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/shard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,KAAK,EAAC,UAAU,EAAE,mBAAmB,EAAC,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAKpD,wBAAgB,MAAM,CAAC,OAAO,EAAE,MAAM,UACtB,MAAM,YACrB;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,UAExC;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,UAE9C;AAED,eAAO,MAAM,sBAAsB,UAAU,CAAC;AAC9C,eAAO,MAAM,2BAA2B,WAAW,CAAC;AA8DpD,wBAAsB,cAAc,CAClC,EAAE,EAAE,UAAU,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAAC,CAAC,CAMnC;AAED;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,EAAE,EAAE,UAAU,EACd,EAAE,EAAE,mBAAmB,EACvB,EAAC,EAAE,EAAE,YAAY,EAAC,EAAE,WAAW,iBA8ChC"}

package/out/zero-cache/src/services/change-streamer/pg/schema/shard.js

@@ -0,0 +1,150 @@
+import { ident, literal } from 'pg-format';
+import { assert } from '../../../../../../shared/src/asserts.js';
+import { warnIfDataTypeSupported } from '../../../../db/pg-to-lite.js';
+import { ZERO_VERSION_COLUMN_NAME } from '../../../replicator/schema/replication-state.js';
+import { createEventTriggerStatements } from './ddl.js';
+import { getPublicationInfo } from './published.js';
+// Creates a function that appends `_SHARD_ID` to the input.
+export function append(shardID) {
+    return (name) => ident(name + '_' + shardID);
+}
+export function schemaFor(shardID) {
+    return append(shardID)('zero');
+}
+export function unescapedSchema(shardID) {
+    return `zero_${shardID}`;
+}
+export const APP_PUBLICATION_PREFIX = 'zero_';
+export const INTERNAL_PUBLICATION_PREFIX = '_zero_';
+const DEFAULT_APP_PUBLICATION = APP_PUBLICATION_PREFIX + 'public';
+const METADATA_PUBLICATION_PREFIX = INTERNAL_PUBLICATION_PREFIX + 'metadata_';
+// The GLOBAL_SETUP must be idempotent as it can be run multiple times for different shards.
+const GLOBAL_SETUP = `
+  CREATE SCHEMA IF NOT EXISTS zero;
+
+  CREATE TABLE IF NOT EXISTS zero."schemaVersions" (
+    "minSupportedVersion" INT4,
+    "maxSupportedVersion" INT4,
+
+    -- Ensure that there is only a single row in the table.
+    -- Application code can be agnostic to this column, and
+    -- simply invoke UPDATE statements on the version columns.
+    "lock" BOOL PRIMARY KEY DEFAULT true,
+    CONSTRAINT zero_schema_versions_single_row_constraint CHECK (lock)
+  );
+
+  INSERT INTO zero."schemaVersions" ("lock", "minSupportedVersion", "maxSupportedVersion")
+    VALUES (true, 1, 1) ON CONFLICT DO NOTHING;
+`;
+function shardSetup(shardID, publications) {
+    const sharded = append(shardID);
+    const schema = schemaFor(shardID);
+    const metadataPublication = METADATA_PUBLICATION_PREFIX + shardID;
+    publications.push(metadataPublication);
+    publications.sort();
+    return (`
+  CREATE SCHEMA IF NOT EXISTS ${schema};
+
+  CREATE TABLE ${schema}."clients" (
+    "clientGroupID"  TEXT NOT NULL,
+    "clientID"       TEXT NOT NULL,
+    "lastMutationID" BIGINT NOT NULL,
+    "userID"         TEXT,
+    PRIMARY KEY("clientGroupID", "clientID")
+  );
+
+  CREATE PUBLICATION ${ident(metadataPublication)}
+    FOR TABLE zero."schemaVersions", TABLE ${schema}."clients";
+
+  CREATE TABLE ${schema}."shardConfig" (
+    "publications"  TEXT[] NOT NULL,
+
+    -- Ensure that there is only a single row in the table.
+    "lock" BOOL PRIMARY KEY DEFAULT true,
+    CONSTRAINT ${sharded('single_row_shard_config')} CHECK (lock)
+  );
+
+  INSERT INTO ${schema}."shardConfig" (lock, publications)
+    VALUES (true, ARRAY[${literal(publications)}]);
+  ` + createEventTriggerStatements(shardID, publications));
+}
+export async function getShardConfig(db, shardID) {
+    const result = await db `
+    SELECT publications FROM ${db(unescapedSchema(shardID))}."shardConfig";
+  `;
+    assert(result.length === 1);
+    return result[0];
+}
+/**
+ * Sets up and returns all publications (including internal ones) for
+ * the given shard.
+ */
+export async function setupTablesAndReplication(lc, tx, { id, publications }) {
+    // Validate requested publications.
+    for (const pub of publications) {
+        // TODO: We can consider relaxing this now that we use per-shard
+        // triggers rather than global prefix-based triggers. We should
+        // probably still disallow the INTERNAL_PUBLICATION_PREFIX though.
+        if (!pub.startsWith(APP_PUBLICATION_PREFIX)) {
+            throw new Error(`Publication ${pub} does not start with ${APP_PUBLICATION_PREFIX}`);
+        }
+    }
+    const allPublications = [];
+    // Setup application publications.
+    if (publications.length) {
+        const results = await tx `
+    SELECT pubname from pg_publication WHERE pubname IN ${tx(publications)}`.values();
+        if (results.length !== publications.length) {
+            throw new Error(`Unknown or invalid publications. Specified: [${publications}]. Found: [${results.flat()}]`);
+        }
+        allPublications.push(...publications);
+    }
+    else {
+        const defaultPub = await tx `
+    SELECT 1 FROM pg_publication WHERE pubname = ${DEFAULT_APP_PUBLICATION}`;
+        if (defaultPub.length === 0) {
+            await tx `
+      CREATE PUBLICATION ${tx(DEFAULT_APP_PUBLICATION)} FOR TABLES IN SCHEMA public`;
+        }
+        allPublications.push(DEFAULT_APP_PUBLICATION);
+    }
+    // Setup the global tables and shard tables / publications.
+    await tx.unsafe(GLOBAL_SETUP + shardSetup(id, allPublications));
+    const pubInfo = await getPublicationInfo(tx, allPublications);
+    validatePublications(lc, unescapedSchema(id), pubInfo);
+}
+const ALLOWED_IDENTIFIER_CHARS = /^[A-Za-z_]+[A-Za-z0-9_-]*$/;
+function validatePublications(lc, shardSchema, published) {
+    // Verify that all publications export the proper events.
+    published.publications.forEach(pub => {
+        if (!pub.pubinsert ||
+            !pub.pubtruncate ||
+            !pub.pubdelete ||
+            !pub.pubtruncate) {
+            // TODO: Make APIError?
+            throw new Error(`PUBLICATION ${pub.pubname} must publish insert, update, delete, and truncate`);
+        }
+    });
+    published.tables.forEach(table => {
+        if (!['public', 'zero', shardSchema].includes(table.schema)) {
+            // This may be relaxed in the future. We would need a plan for support in the AST first.
+            throw new Error('Only the default "public" schema is supported.');
+        }
+        if (ZERO_VERSION_COLUMN_NAME in table.columns) {
+            throw new Error(`Table "${table.name}" uses reserved column name "${ZERO_VERSION_COLUMN_NAME}"`);
+        }
+        if (table.primaryKey.length === 0) {
+            throw new Error(`Table "${table.name}" does not have a PRIMARY KEY`);
+        }
+        if (!ALLOWED_IDENTIFIER_CHARS.test(table.name)) {
+            throw new Error(`Table "${table.name}" has invalid characters.`);
+        }
+        for (const [col, spec] of Object.entries(table.columns)) {
+            if (!ALLOWED_IDENTIFIER_CHARS.test(col)) {
+                throw new Error(`Column "${col}" in table "${table.name}" has invalid characters.`);
+            }
+            warnIfDataTypeSupported(lc, spec.dataType, table.name, col);
+        }
+    });
+}
+//# sourceMappingURL=shard.js.map

package/out/zero-cache/src/services/change-streamer/pg/schema/shard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shard.js","sourceRoot":"","sources":["../../../../../../../../zero-cache/src/services/change-streamer/pg/schema/shard.ts"],"names":[],"mappings":"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"}

package/out/zero-cache/src/services/change-streamer/pg/sync-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync-schema.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/pg/sync-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEnD,wBAAsB,cAAc,CAClC,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CASf"}
+{"version":3,"file":"sync-schema.d.ts","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/pg/sync-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAQjD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAEnD,wBAAsB,cAAc,CAClC,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAsBf"}

package/out/zero-cache/src/services/change-streamer/pg/sync-schema.js

@@ -1,12 +1,18 @@
 import { runSchemaMigrations, } from '../../../db/migration-lite.js';
 import { initialSync } from './initial-sync.js';
 export async function initSyncSchema(log, debugName, shard, dbPath, upstreamURI) {
+    const setupMigration = {
+        migrateSchema: (log, tx) => initialSync(log, shard, tx, upstreamURI),
+        minSafeVersion: 1,
+    };
     const schemaVersionMigrationMap = {
-        1: { minSafeRollbackVersion: 1 }, // The inaugural v1 understands the rollback limit.
-        2: {
-            run: (log, tx) => initialSync(log, shard, tx, upstreamURI),
-        },
+        1: setupMigration,
+        // There are no incremental migrations yet, but if we were to, say introduce
+        // another column, initialSync would be updated to create the table with
+        // the new column, and then there would be an incremental migration here at
+        // version `2` that adds the column for databases that were initialized to
+        // version `1`.
     };
-    await runSchemaMigrations(log, debugName, dbPath, schemaVersionMigrationMap);
+    await runSchemaMigrations(log, debugName, dbPath, setupMigration, schemaVersionMigrationMap);
 }
 //# sourceMappingURL=sync-schema.js.map

package/out/zero-cache/src/services/change-streamer/pg/sync-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-schema.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/pg/sync-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,GAEpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAe,EACf,SAAiB,EACjB,KAAkB,EAClB,MAAc,EACd,WAAmB;IAEnB,MAAM,yBAAyB,GAAwB;QACrD,CAAC,EAAE,EAAC,sBAAsB,EAAE,CAAC,EAAC,EAAE,mDAAmD;QACnF,CAAC,EAAE;YACD,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,CAAC;SAC3D;KACF,CAAC;IAEF,MAAM,mBAAmB,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,yBAAyB,CAAC,CAAC;AAC/E,CAAC"}
+{"version":3,"file":"sync-schema.js","sourceRoot":"","sources":["../../../../../../../zero-cache/src/services/change-streamer/pg/sync-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,mBAAmB,GAGpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAG9C,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAe,EACf,SAAiB,EACjB,KAAkB,EAClB,MAAc,EACd,WAAmB;IAEnB,MAAM,cAAc,GAAc;QAChC,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,CAAC;QACpE,cAAc,EAAE,CAAC;KAClB,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACzD,CAAC,EAAE,cAAc;QACjB,4EAA4E;QAC5E,wEAAwE;QACxE,2EAA2E;QAC3E,0EAA0E;QAC1E,eAAe;KAChB,CAAC;IAEF,MAAM,mBAAmB,CACvB,GAAG,EACH,SAAS,EACT,MAAM,EACN,cAAc,EACd,yBAAyB,CAC1B,CAAC;AACJ,CAAC"}