@tricoteuses/senat 3.1.22 → 3.1.24

package/lib/src/scripts/shared/schema_version.js

@@ -2,94 +2,94 @@ function escapeSqlLiteral(value) {
     return value.replace(/'/g, "''");
 }
 export function buildEnsureSchemaVersionTableSql(schemaName) {
-    return `
-CREATE TABLE IF NOT EXISTS ${schemaName}.version(
-  number integer PRIMARY KEY
-);
-COMMENT ON TABLE ${schemaName}.version IS 'version of database';
-COMMENT ON COLUMN ${schemaName}.version.number IS 'version number of database schema';
-INSERT INTO ${schemaName}.version(number)
-SELECT 0
-WHERE NOT EXISTS (SELECT 1 FROM ${schemaName}.version);
+    return `
+CREATE TABLE IF NOT EXISTS ${schemaName}.version(
+  number integer PRIMARY KEY
+);
+COMMENT ON TABLE ${schemaName}.version IS 'version of database';
+COMMENT ON COLUMN ${schemaName}.version.number IS 'version number of database schema';
+INSERT INTO ${schemaName}.version(number)
+SELECT 0
+WHERE NOT EXISTS (SELECT 1 FROM ${schemaName}.version);
 `;
 }
 export function buildSchemaStructureFingerprintQuery(schemaName) {
     const escapedSchemaName = escapeSqlLiteral(schemaName);
-    return `
-WITH objects AS (
-  SELECT format('table:%s', table_class.relname) AS entry
-  FROM pg_class table_class
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  WHERE table_namespace.nspname = '${escapedSchemaName}'
-    AND table_class.relkind IN ('r', 'p')
-    AND table_class.relname <> 'version'
-
-  UNION ALL
-
-  SELECT format(
-    'column:%s:%s:%s:%s:%s:%s:%s:%s',
-    columns.table_name,
-    columns.ordinal_position,
-    columns.column_name,
-    columns.udt_schema,
-    columns.udt_name,
-    columns.is_nullable,
-    coalesce(columns.column_default, ''),
-    columns.is_identity
-  ) AS entry
-  FROM information_schema.columns columns
-  WHERE columns.table_schema = '${escapedSchemaName}'
-    AND columns.table_name <> 'version'
-
-  UNION ALL
-
-  SELECT format(
-    'constraint:%s:%s:%s:%s',
-    table_class.relname,
-    constraint_data.contype,
-    constraint_data.conname,
-    pg_get_constraintdef(constraint_data.oid, true)
-  ) AS entry
-  FROM pg_constraint constraint_data
-  JOIN pg_class table_class ON table_class.oid = constraint_data.conrelid
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  WHERE table_namespace.nspname = '${escapedSchemaName}'
-    AND table_class.relname <> 'version'
-    AND constraint_data.contype <> 'n'
-
-  UNION ALL
-
-  SELECT format(
-    'index:%s:%s',
-    table_class.relname,
-    pg_get_indexdef(idx.indexrelid)
-  ) AS entry
-  FROM pg_index idx
-  JOIN pg_class table_class ON table_class.oid = idx.indrelid
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  LEFT JOIN pg_constraint constraint_data ON constraint_data.conindid = idx.indexrelid
-  WHERE table_namespace.nspname = '${escapedSchemaName}'
-    AND table_class.relname <> 'version'
-    AND constraint_data.oid IS NULL
-
-  UNION ALL
-
-  SELECT format(
-    'sequence:%s:%s:%s:%s:%s:%s:%s:%s',
-    sequences.sequencename,
-    sequences.data_type,
-    sequences.start_value,
-    sequences.min_value,
-    sequences.max_value,
-    sequences.increment_by,
-    sequences.cycle,
-    sequences.cache_size
-  ) AS entry
-  FROM pg_sequences sequences
-  WHERE sequences.schemaname = '${escapedSchemaName}'
-)
-SELECT coalesce(md5(string_agg(entry, E'\\n' ORDER BY entry)), '')
-FROM objects
+    return `
+WITH objects AS (
+  SELECT format('table:%s', table_class.relname) AS entry
+  FROM pg_class table_class
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  WHERE table_namespace.nspname = '${escapedSchemaName}'
+    AND table_class.relkind IN ('r', 'p')
+    AND table_class.relname <> 'version'
+
+  UNION ALL
+
+  SELECT format(
+    'column:%s:%s:%s:%s:%s:%s:%s:%s',
+    columns.table_name,
+    columns.ordinal_position,
+    columns.column_name,
+    columns.udt_schema,
+    columns.udt_name,
+    columns.is_nullable,
+    coalesce(columns.column_default, ''),
+    columns.is_identity
+  ) AS entry
+  FROM information_schema.columns columns
+  WHERE columns.table_schema = '${escapedSchemaName}'
+    AND columns.table_name <> 'version'
+
+  UNION ALL
+
+  SELECT format(
+    'constraint:%s:%s:%s:%s',
+    table_class.relname,
+    constraint_data.contype,
+    constraint_data.conname,
+    pg_get_constraintdef(constraint_data.oid, true)
+  ) AS entry
+  FROM pg_constraint constraint_data
+  JOIN pg_class table_class ON table_class.oid = constraint_data.conrelid
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  WHERE table_namespace.nspname = '${escapedSchemaName}'
+    AND table_class.relname <> 'version'
+    AND constraint_data.contype <> 'n'
+
+  UNION ALL
+
+  SELECT format(
+    'index:%s:%s',
+    table_class.relname,
+    pg_get_indexdef(idx.indexrelid)
+  ) AS entry
+  FROM pg_index idx
+  JOIN pg_class table_class ON table_class.oid = idx.indrelid
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  LEFT JOIN pg_constraint constraint_data ON constraint_data.conindid = idx.indexrelid
+  WHERE table_namespace.nspname = '${escapedSchemaName}'
+    AND table_class.relname <> 'version'
+    AND constraint_data.oid IS NULL
+
+  UNION ALL
+
+  SELECT format(
+    'sequence:%s:%s:%s:%s:%s:%s:%s:%s',
+    sequences.sequencename,
+    sequences.data_type,
+    sequences.start_value,
+    sequences.min_value,
+    sequences.max_value,
+    sequences.increment_by,
+    sequences.cycle,
+    sequences.cache_size
+  ) AS entry
+  FROM pg_sequences sequences
+  WHERE sequences.schemaname = '${escapedSchemaName}'
+)
+SELECT coalesce(md5(string_agg(entry, E'\\n' ORDER BY entry)), '')
+FROM objects
 `;
 }
 export function buildIncrementSchemaVersionSql(schemaName) {

package/lib/src/scripts/shared/staging_metadata_sql.js

@@ -3,219 +3,219 @@ function escapeSqlLiteral(value) {
 }
 export function buildExportStagingMetadataStatementsQuery(stagingSchema, targetSchema) {
     const escapedStagingSchema = escapeSqlLiteral(stagingSchema);
-    return `
-WITH ordered_statements AS (
-  SELECT
-    10 AS group_no,
-    0 AS order_no,
-    sequences.sequencename AS object_name,
-    format('CREATE SEQUENCE IF NOT EXISTS %I.%I', '${targetSchema}', sequences.sequencename) AS statement
-  FROM pg_sequences sequences
-  WHERE sequences.schemaname = '${escapedStagingSchema}'
-
-  UNION ALL
-
-  SELECT
-    20 AS group_no,
-    0 AS order_no,
-    sequences.sequencename AS object_name,
-    format(
-      'ALTER SEQUENCE %I.%I AS %s INCREMENT BY %s MINVALUE %s MAXVALUE %s START WITH %s CACHE %s %s',
-      '${targetSchema}',
-      sequences.sequencename,
-      sequences.data_type,
-      sequences.increment_by,
-      sequences.min_value,
-      sequences.max_value,
-      sequences.start_value,
-      sequences.cache_size,
-      CASE WHEN sequences.cycle THEN 'CYCLE' ELSE 'NO CYCLE' END
-    ) AS statement
-  FROM pg_sequences sequences
-  WHERE sequences.schemaname = '${escapedStagingSchema}'
-
-  UNION ALL
-
-  SELECT
-    30 AS group_no,
-    0 AS order_no,
-    sequence_class.relname AS object_name,
-    CASE
-      WHEN dependent_table.relname IS NULL THEN format(
-        'ALTER SEQUENCE %I.%I OWNED BY NONE',
-        '${targetSchema}',
-        sequence_class.relname
-      )
-      ELSE format(
-        'ALTER SEQUENCE %I.%I OWNED BY %I.%I.%I',
-        '${targetSchema}',
-        sequence_class.relname,
-        '${targetSchema}',
-        dependent_table.relname,
-        dependent_column.attname
-      )
-    END AS statement
-  FROM pg_class sequence_class
-  JOIN pg_namespace sequence_namespace ON sequence_namespace.oid = sequence_class.relnamespace
-  LEFT JOIN pg_depend dependency
-    ON dependency.objid = sequence_class.oid
-   AND dependency.deptype = 'a'
-  LEFT JOIN pg_class dependent_table ON dependent_table.oid = dependency.refobjid
-  LEFT JOIN pg_namespace dependent_namespace ON dependent_namespace.oid = dependent_table.relnamespace
-  LEFT JOIN pg_attribute dependent_column
-    ON dependent_column.attrelid = dependent_table.oid
-   AND dependent_column.attnum = dependency.refobjsubid
-  WHERE sequence_namespace.nspname = '${escapedStagingSchema}'
-    AND sequence_class.relkind = 'S'
-    AND (
-      dependent_namespace.nspname IS NULL
-      OR dependent_namespace.nspname = '${escapedStagingSchema}'
-    )
-
-  UNION ALL
-
-  SELECT
-    40 AS group_no,
-    0 AS order_no,
-    format('%s.%s', table_class.relname, attribute.attname) AS object_name,
-    CASE
-      WHEN default_expr.expression IS NULL THEN format(
-        'ALTER TABLE %I.%I ALTER COLUMN %I DROP DEFAULT',
-        '${targetSchema}',
-        table_class.relname,
-        attribute.attname
-      )
-      ELSE format(
-        'ALTER TABLE %I.%I ALTER COLUMN %I SET DEFAULT %s',
-        '${targetSchema}',
-        table_class.relname,
-        attribute.attname,
-        replace(default_expr.expression, '${stagingSchema}.', '${targetSchema}.')
-      )
-    END AS statement
-  FROM pg_class table_class
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  JOIN pg_attribute attribute ON attribute.attrelid = table_class.oid
-  LEFT JOIN LATERAL (
-    SELECT pg_get_expr(attr_def.adbin, attr_def.adrelid) AS expression
-    FROM pg_attrdef attr_def
-    WHERE attr_def.adrelid = attribute.attrelid
-      AND attr_def.adnum = attribute.attnum
-  ) default_expr ON true
-  WHERE table_namespace.nspname = '${escapedStagingSchema}'
-    AND table_class.relkind IN ('r', 'p')
-    AND attribute.attnum > 0
-    AND NOT attribute.attisdropped
-    AND attribute.attgenerated = ''
-    AND attribute.attidentity = ''
-
-  UNION ALL
-
-  SELECT
-    50 AS group_no,
-    0 AS order_no,
-    table_class.relname AS object_name,
-    format(
-      'COMMENT ON TABLE %I.%I IS %L',
-      '${targetSchema}',
-      table_class.relname,
-      obj_description(table_class.oid, 'pg_class')
-    ) AS statement
-  FROM pg_class table_class
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  WHERE table_namespace.nspname = '${escapedStagingSchema}'
-    AND table_class.relkind IN ('r', 'p')
-
-  UNION ALL
-
-  SELECT
-    60 AS group_no,
-    0 AS order_no,
-    format('%s.%s', table_class.relname, attribute.attname) AS object_name,
-    format(
-      'COMMENT ON COLUMN %I.%I.%I IS %L',
-      '${targetSchema}',
-      table_class.relname,
-      attribute.attname,
-      col_description(table_class.oid, attribute.attnum)
-    ) AS statement
-  FROM pg_class table_class
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  JOIN pg_attribute attribute ON attribute.attrelid = table_class.oid
-  WHERE table_namespace.nspname = '${escapedStagingSchema}'
-    AND table_class.relkind IN ('r', 'p')
-    AND attribute.attnum > 0
-    AND NOT attribute.attisdropped
-
-  UNION ALL
-
-  SELECT
-    70 AS group_no,
-    CASE constraint_data.contype
-      WHEN 'p' THEN 1
-      WHEN 'u' THEN 2
-      WHEN 'c' THEN 3
-      WHEN 'f' THEN 4
-      ELSE 5
-    END AS order_no,
-    format('%s.%s', table_class.relname, constraint_data.conname) AS object_name,
-    format(
-      'ALTER TABLE %I.%I ADD CONSTRAINT %I %s',
-      '${targetSchema}',
-      table_class.relname,
-      constraint_data.conname,
-      replace(
-        replace(
-          pg_get_constraintdef(constraint_data.oid, true),
-          ' REFERENCES ' || '${stagingSchema}' || '.',
-          ' REFERENCES ${targetSchema}.'
-        ),
-        ' REFERENCES ONLY ' || '${stagingSchema}' || '.',
-        ' REFERENCES ONLY ${targetSchema}.'
-      )
-    ) AS statement
-  FROM pg_constraint constraint_data
-  JOIN pg_class table_class ON table_class.oid = constraint_data.conrelid
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  WHERE table_namespace.nspname = '${escapedStagingSchema}'
-    AND constraint_data.contype <> 'n'
-
-  UNION ALL
-
-  SELECT
-    80 AS group_no,
-    0 AS order_no,
-    format('%s.%s', table_class.relname, index_class.relname) AS object_name,
-    replace(
-      pg_get_indexdef(index_data.indexrelid),
-      ' ON ${stagingSchema}.',
-      ' ON ${targetSchema}.'
-    ) AS statement
-  FROM pg_index index_data
-  JOIN pg_class table_class ON table_class.oid = index_data.indrelid
-  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
-  JOIN pg_class index_class ON index_class.oid = index_data.indexrelid
-  LEFT JOIN pg_constraint constraint_data ON constraint_data.conindid = index_data.indexrelid
-  WHERE table_namespace.nspname = '${escapedStagingSchema}'
-    AND constraint_data.oid IS NULL
-
-  UNION ALL
-
-  SELECT
-    90 AS group_no,
-    0 AS order_no,
-    sequences.sequencename AS object_name,
-    format(
-      'SELECT setval(%L, %s, %s)',
-      '${targetSchema}.' || sequences.sequencename,
-      coalesce(sequences.last_value, sequences.start_value),
-      CASE WHEN sequences.last_value IS NULL THEN 'false' ELSE 'true' END
-    ) AS statement
-  FROM pg_sequences sequences
-  WHERE sequences.schemaname = '${escapedStagingSchema}'
-)
-SELECT encode(convert_to(statement, 'UTF8'), 'hex')
-FROM ordered_statements
-ORDER BY group_no, order_no, object_name;
+    return `
+WITH ordered_statements AS (
+  SELECT
+    10 AS group_no,
+    0 AS order_no,
+    sequences.sequencename AS object_name,
+    format('CREATE SEQUENCE IF NOT EXISTS %I.%I', '${targetSchema}', sequences.sequencename) AS statement
+  FROM pg_sequences sequences
+  WHERE sequences.schemaname = '${escapedStagingSchema}'
+
+  UNION ALL
+
+  SELECT
+    20 AS group_no,
+    0 AS order_no,
+    sequences.sequencename AS object_name,
+    format(
+      'ALTER SEQUENCE %I.%I AS %s INCREMENT BY %s MINVALUE %s MAXVALUE %s START WITH %s CACHE %s %s',
+      '${targetSchema}',
+      sequences.sequencename,
+      sequences.data_type,
+      sequences.increment_by,
+      sequences.min_value,
+      sequences.max_value,
+      sequences.start_value,
+      sequences.cache_size,
+      CASE WHEN sequences.cycle THEN 'CYCLE' ELSE 'NO CYCLE' END
+    ) AS statement
+  FROM pg_sequences sequences
+  WHERE sequences.schemaname = '${escapedStagingSchema}'
+
+  UNION ALL
+
+  SELECT
+    30 AS group_no,
+    0 AS order_no,
+    sequence_class.relname AS object_name,
+    CASE
+      WHEN dependent_table.relname IS NULL THEN format(
+        'ALTER SEQUENCE %I.%I OWNED BY NONE',
+        '${targetSchema}',
+        sequence_class.relname
+      )
+      ELSE format(
+        'ALTER SEQUENCE %I.%I OWNED BY %I.%I.%I',
+        '${targetSchema}',
+        sequence_class.relname,
+        '${targetSchema}',
+        dependent_table.relname,
+        dependent_column.attname
+      )
+    END AS statement
+  FROM pg_class sequence_class
+  JOIN pg_namespace sequence_namespace ON sequence_namespace.oid = sequence_class.relnamespace
+  LEFT JOIN pg_depend dependency
+    ON dependency.objid = sequence_class.oid
+   AND dependency.deptype = 'a'
+  LEFT JOIN pg_class dependent_table ON dependent_table.oid = dependency.refobjid
+  LEFT JOIN pg_namespace dependent_namespace ON dependent_namespace.oid = dependent_table.relnamespace
+  LEFT JOIN pg_attribute dependent_column
+    ON dependent_column.attrelid = dependent_table.oid
+   AND dependent_column.attnum = dependency.refobjsubid
+  WHERE sequence_namespace.nspname = '${escapedStagingSchema}'
+    AND sequence_class.relkind = 'S'
+    AND (
+      dependent_namespace.nspname IS NULL
+      OR dependent_namespace.nspname = '${escapedStagingSchema}'
+    )
+
+  UNION ALL
+
+  SELECT
+    40 AS group_no,
+    0 AS order_no,
+    format('%s.%s', table_class.relname, attribute.attname) AS object_name,
+    CASE
+      WHEN default_expr.expression IS NULL THEN format(
+        'ALTER TABLE %I.%I ALTER COLUMN %I DROP DEFAULT',
+        '${targetSchema}',
+        table_class.relname,
+        attribute.attname
+      )
+      ELSE format(
+        'ALTER TABLE %I.%I ALTER COLUMN %I SET DEFAULT %s',
+        '${targetSchema}',
+        table_class.relname,
+        attribute.attname,
+        replace(default_expr.expression, '${stagingSchema}.', '${targetSchema}.')
+      )
+    END AS statement
+  FROM pg_class table_class
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  JOIN pg_attribute attribute ON attribute.attrelid = table_class.oid
+  LEFT JOIN LATERAL (
+    SELECT pg_get_expr(attr_def.adbin, attr_def.adrelid) AS expression
+    FROM pg_attrdef attr_def
+    WHERE attr_def.adrelid = attribute.attrelid
+      AND attr_def.adnum = attribute.attnum
+  ) default_expr ON true
+  WHERE table_namespace.nspname = '${escapedStagingSchema}'
+    AND table_class.relkind IN ('r', 'p')
+    AND attribute.attnum > 0
+    AND NOT attribute.attisdropped
+    AND attribute.attgenerated = ''
+    AND attribute.attidentity = ''
+
+  UNION ALL
+
+  SELECT
+    50 AS group_no,
+    0 AS order_no,
+    table_class.relname AS object_name,
+    format(
+      'COMMENT ON TABLE %I.%I IS %L',
+      '${targetSchema}',
+      table_class.relname,
+      obj_description(table_class.oid, 'pg_class')
+    ) AS statement
+  FROM pg_class table_class
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  WHERE table_namespace.nspname = '${escapedStagingSchema}'
+    AND table_class.relkind IN ('r', 'p')
+
+  UNION ALL
+
+  SELECT
+    60 AS group_no,
+    0 AS order_no,
+    format('%s.%s', table_class.relname, attribute.attname) AS object_name,
+    format(
+      'COMMENT ON COLUMN %I.%I.%I IS %L',
+      '${targetSchema}',
+      table_class.relname,
+      attribute.attname,
+      col_description(table_class.oid, attribute.attnum)
+    ) AS statement
+  FROM pg_class table_class
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  JOIN pg_attribute attribute ON attribute.attrelid = table_class.oid
+  WHERE table_namespace.nspname = '${escapedStagingSchema}'
+    AND table_class.relkind IN ('r', 'p')
+    AND attribute.attnum > 0
+    AND NOT attribute.attisdropped
+
+  UNION ALL
+
+  SELECT
+    70 AS group_no,
+    CASE constraint_data.contype
+      WHEN 'p' THEN 1
+      WHEN 'u' THEN 2
+      WHEN 'c' THEN 3
+      WHEN 'f' THEN 4
+      ELSE 5
+    END AS order_no,
+    format('%s.%s', table_class.relname, constraint_data.conname) AS object_name,
+    format(
+      'ALTER TABLE %I.%I ADD CONSTRAINT %I %s',
+      '${targetSchema}',
+      table_class.relname,
+      constraint_data.conname,
+      replace(
+        replace(
+          pg_get_constraintdef(constraint_data.oid, true),
+          ' REFERENCES ' || '${stagingSchema}' || '.',
+          ' REFERENCES ${targetSchema}.'
+        ),
+        ' REFERENCES ONLY ' || '${stagingSchema}' || '.',
+        ' REFERENCES ONLY ${targetSchema}.'
+      )
+    ) AS statement
+  FROM pg_constraint constraint_data
+  JOIN pg_class table_class ON table_class.oid = constraint_data.conrelid
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  WHERE table_namespace.nspname = '${escapedStagingSchema}'
+    AND constraint_data.contype <> 'n'
+
+  UNION ALL
+
+  SELECT
+    80 AS group_no,
+    0 AS order_no,
+    format('%s.%s', table_class.relname, index_class.relname) AS object_name,
+    replace(
+      pg_get_indexdef(index_data.indexrelid),
+      ' ON ${stagingSchema}.',
+      ' ON ${targetSchema}.'
+    ) AS statement
+  FROM pg_index index_data
+  JOIN pg_class table_class ON table_class.oid = index_data.indrelid
+  JOIN pg_namespace table_namespace ON table_namespace.oid = table_class.relnamespace
+  JOIN pg_class index_class ON index_class.oid = index_data.indexrelid
+  LEFT JOIN pg_constraint constraint_data ON constraint_data.conindid = index_data.indexrelid
+  WHERE table_namespace.nspname = '${escapedStagingSchema}'
+    AND constraint_data.oid IS NULL
+
+  UNION ALL
+
+  SELECT
+    90 AS group_no,
+    0 AS order_no,
+    sequences.sequencename AS object_name,
+    format(
+      'SELECT setval(%L, %s, %s)',
+      '${targetSchema}.' || sequences.sequencename,
+      coalesce(sequences.last_value, sequences.start_value),
+      CASE WHEN sequences.last_value IS NULL THEN 'false' ELSE 'true' END
+    ) AS statement
+  FROM pg_sequences sequences
+  WHERE sequences.schemaname = '${escapedStagingSchema}'
+)
+SELECT encode(convert_to(statement, 'UTF8'), 'hex')
+FROM ordered_statements
+ORDER BY group_no, order_no, object_name;
 `;
 }

package/lib/src/scripts/validate_prefixed_tables.js

@@ -9,12 +9,12 @@ const optionsDefinitions = [categoriesOption, silentOption];
 const options = commandLineArgs(optionsDefinitions);
 async function listPrefixedSenatTables(dataset) {
     const prefix = `${dataset.database}_`;
-    const result = await sql `
-    select tablename
-    from pg_tables
-    where schemaname = ${senatSchemaName}
-      and tablename like ${prefix + "%"}
-    order by tablename
+    const result = await sql `
+    select tablename
+    from pg_tables
+    where schemaname = ${senatSchemaName}
+      and tablename like ${prefix + "%"}
+    order by tablename
   `.execute(db);
     return result.rows.map(({ tablename }) => tablename);
 }
@@ -27,12 +27,12 @@ function listExpectedPrefixedSenatTables(dataset) {
     return extractPrefixedTableNamesFromGeneratedManifest(manifest, dataset.database);
 }
 async function listColumns(schema, relationName) {
-    const result = await sql `
-    select column_name
-    from information_schema.columns
-    where table_schema = ${schema}
-      and table_name = ${relationName}
-    order by ordinal_position
+    const result = await sql `
+    select column_name
+    from information_schema.columns
+    where table_schema = ${schema}
+      and table_name = ${relationName}
+    order by ordinal_position
   `.execute(db);
     return result.rows.map(({ column_name }) => column_name);
 }