@rebasepro/server-postgres 0.9.1-canary.742f831 → 0.9.1-canary.7dddf96

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/cli.ts CHANGED
@@ -176,7 +176,6 @@ async function dbCommand(subcommand: string, rawArgs: string[]): Promise<void> {
176
176
 
177
177
  if (databaseUrl) {
178
178
  await applyPolicies(databaseUrl);
179
- await reconcilePolicies(databaseUrl, collectionsPath);
180
179
  await ensureRlsUserRole(databaseUrl);
181
180
  } else {
182
181
  logger.warn(chalk.yellow(" ⚠️ DATABASE_URL not found in environment, skipping RLS policies application."));
@@ -270,65 +269,6 @@ async function applyPolicies(databaseUrl: string): Promise<void> {
270
269
  }
271
270
  }
272
271
 
273
- /**
274
- * Remove the policies an earlier push superseded but never dropped.
275
- *
276
- * `policies.sql` only DROPs the names it is about to CREATE, and a rule's
277
- * generated name contains a hash of its own semantics — so editing a rule
278
- * writes a *new* policy and abandons the old one. Postgres ORs PERMISSIVE
279
- * policies together, which makes an abandoned grant outrank every tightening
280
- * that replaced it, and push reported success the whole time.
281
- *
282
- * Runs after `applyPolicies` so the current policies are already in place: the
283
- * drift check then sees exactly the set that should survive, and anything else
284
- * on a managed table is by definition left over.
285
- */
286
- async function reconcilePolicies(databaseUrl: string, collectionsPath: string): Promise<void> {
287
- try {
288
- const { checkPolicyDrift, dropOrphanedPolicies, formatPolicyDrift, hasDrift } =
289
- await import("./security/policy-drift");
290
- const { loadCollections } = await import("./schema/doctor");
291
-
292
- const collections = await loadCollections(path.resolve(process.cwd(), collectionsPath));
293
- const { Client } = await import("pg");
294
- const client = new Client({ connectionString: databaseUrl });
295
- await client.connect();
296
- try {
297
- const drift = await checkPolicyDrift(client as never, collections);
298
- const { dropped, kept } = await dropOrphanedPolicies(client as never, drift, collections);
299
-
300
- for (const p of dropped) {
301
- logger.info(chalk.gray(` ✓ Dropped superseded policy "${p.name}" on ${p.schema}.${p.table}`));
302
- }
303
- if (dropped.length > 0) {
304
- logger.info(chalk.green(` ✓ Removed ${dropped.length} superseded RLS ${dropped.length === 1 ? "policy" : "policies"}.`));
305
- }
306
-
307
- // Custom-named orphans are indistinguishable from policies someone
308
- // wrote in SQL deliberately, so they are reported, never dropped.
309
- if (kept.length > 0) {
310
- logger.warn(chalk.yellow(" ⚠️ Policies in the database that no collection describes:"));
311
- for (const p of kept) {
312
- logger.warn(chalk.yellow(` • ${p.schema}.${p.table} → "${p.name}" (${p.command} TO ${p.roles.join(", ")})`));
313
- }
314
- logger.warn(chalk.yellow(" These still grant access. Drop them by hand if they are stale."));
315
- }
316
-
317
- // Missing/diverged are not push's to fix, but staying silent about
318
- // them is how a database ends up not matching its config.
319
- const remaining = { ...drift, orphaned: kept };
320
- if (hasDrift(remaining) && (remaining.missing.length > 0 || remaining.diverged.length > 0)) {
321
- logger.warn(chalk.yellow(" ⚠️ RLS policies do not match your collections:"));
322
- logger.warn(formatPolicyDrift({ ...remaining, orphaned: [] }));
323
- }
324
- } finally {
325
- await client.end();
326
- }
327
- } catch (err) {
328
- logger.warn(chalk.yellow(` ⚠️ Could not reconcile RLS policies: ${err instanceof Error ? err.message : String(err)}`));
329
- }
330
- }
331
-
332
272
  async function branchCommand(rawArgs: string[]): Promise<void> {
333
273
  const branchAction = rawArgs[2]; // create, list, delete, info
334
274
 
package/src/connection.ts CHANGED
@@ -27,68 +27,11 @@ const DEFAULT_POOL: Required<PostgresPoolConfig> = {
27
27
  max: 20,
28
28
  idleTimeoutMillis: 30_000,
29
29
  connectionTimeoutMillis: 10_000,
30
- // The client-side read timeout MUST be comfortably above the server-side
31
- // statement_timeout. When the client timer fires first, node-postgres
32
- // abandons the in-flight statement but keeps the connection — inside a
33
- // transaction that leaves the tx open (and any pending ROLLBACK is
34
- // spliced out of the client queue before it ever reaches the wire), so
35
- // the pooled connection is returned still in-transaction with its RLS
36
- // GUCs set. The server abort (SQLSTATE 57014) is the clean path; the
37
- // client timeout is only a backstop for a dead network.
38
- queryTimeout: 60_000,
30
+ queryTimeout: 30_000,
39
31
  statementTimeout: 30_000,
40
32
  keepAlive: true
41
33
  };
42
34
 
43
- /** ReadyForQuery status byte: `I` idle, `T` in transaction, `E` failed transaction. */
44
- const TX_IDLE = "I";
45
-
46
- /**
47
- * Destroy pool clients that are released while still inside a transaction.
48
- *
49
- * pg-pool returns a client to the idle list whenever `release()` is called
50
- * without an error — even if the connection is still mid-transaction (status
51
- * `T`/`E`). That happens in practice: drizzle's pool transaction releases in
52
- * a `finally` after attempting ROLLBACK, and if the ROLLBACK itself fails
53
- * (e.g. it was queued behind a statement that hit the client-side
54
- * query_timeout), the client goes back dirty. The next checkout then runs
55
- * its statements inside the zombie transaction — with the previous request's
56
- * `app.*` RLS GUCs still applied, which turns unrelated queries into
57
- * RLS-scoped ones (observed in production as registration failing with
58
- * SQLSTATE 42501 under a leaked anonymous context).
59
- *
60
- * pg-pool emits `release` before it consults its private `_expired` set, so
61
- * marking the client expired here makes `_release()` destroy it instead of
62
- * pooling it. Both `client._txStatus` (pg ≥ 8.16) and `pool._expired` are
63
- * private APIs — feature-detect and fall back to loud logging so an upstream
64
- * change degrades to observability, never to silent corruption.
65
- */
66
- export function guardPoolAgainstDirtyRelease(pool: Pool, label: string): void {
67
- pool.on("release", (err: Error | undefined, client: unknown) => {
68
- if (err) return; // errored clients are already destroyed by pg-pool
69
- const txStatus = (client as { _txStatus?: string | null })?._txStatus;
70
- if (typeof txStatus !== "string" || txStatus === TX_IDLE) return;
71
-
72
- // pg-pool keeps expired clients in a WeakSet (a plain object works too
73
- // if upstream ever changes it — duck-type on add/has).
74
- const expired = (pool as unknown as { _expired?: { add(c: object): unknown; has(c: object): boolean } })._expired;
75
- if (expired && typeof expired.add === "function" && typeof expired.has === "function" && client && typeof client === "object") {
76
- expired.add(client);
77
- logger.error(
78
- `[${label}] Client released back to the pool while still in a transaction ` +
79
- `(status '${txStatus}') — destroying it so the open transaction and its ` +
80
- `session state (RLS GUCs) cannot leak into the next request.`
81
- );
82
- } else {
83
- logger.error(
84
- `[${label}] Client released mid-transaction (status '${txStatus}') but the ` +
85
- `pool's internal expiry set is unavailable (pg-pool internals changed?). ` +
86
- `The connection may leak its open transaction into subsequent requests.`
87
- );
88
- }
89
- });
90
- }
91
-
92
35
  /**
93
36
  * Create a Drizzle-backed Postgres connection with a production-grade
94
37
  * connection pool.
@@ -132,7 +75,6 @@ export function createPostgresDatabaseConnection(
132
75
  logger.warn("[pg-pool] Connection timeout detected — pool will auto-retry");
133
76
  }
134
77
  });
135
- guardPoolAgainstDirtyRelease(pool, "pg-pool");
136
78
 
137
79
  // Create drizzle instance — pass schema when available to enable db.query relational API
138
80
  const db = schema ? drizzle(pool, { schema }) : drizzle(pool);
@@ -176,7 +118,6 @@ export function createDirectDatabaseConnection(
176
118
  pool.on("error", (err) => {
177
119
  logger.error("[pg-direct-pool] Unexpected pool error", { detail: err.message });
178
120
  });
179
- guardPoolAgainstDirtyRelease(pool, "pg-direct-pool");
180
121
 
181
122
  const db = schema ? drizzle(pool, { schema }) : drizzle(pool);
182
123
 
@@ -216,7 +157,6 @@ export function createReadReplicaConnection(
216
157
  pool.on("error", (err) => {
217
158
  logger.error("[pg-replica-pool] Unexpected pool error", { detail: err.message });
218
159
  });
219
- guardPoolAgainstDirtyRelease(pool, "pg-replica-pool");
220
160
 
221
161
  const db = schema ? drizzle(pool, { schema }) : drizzle(pool);
222
162
 
@@ -2,7 +2,6 @@ import { Pool } from "pg";
2
2
  import { drizzle } from "drizzle-orm/node-postgres";
3
3
  import { NodePgDatabase } from "drizzle-orm/node-postgres";
4
4
  import { logger } from "@rebasepro/server";
5
- import { guardPoolAgainstDirtyRelease } from "./connection";
6
5
 
7
6
  export class DatabasePoolManager {
8
7
  private pools: Map<string, Pool> = new Map();
@@ -51,7 +50,6 @@ export class DatabasePoolManager {
51
50
  pool.on("error", (err) => {
52
51
  logger.error(`[DatabasePoolManager] Unexpected error on idle client for db ${databaseName}`, { error: err });
53
52
  });
54
- guardPoolAgainstDirtyRelease(pool, `pg-pool:${databaseName}`);
55
53
 
56
54
  this.pools.set(databaseName, pool);
57
55
  return pool;
@@ -37,7 +37,7 @@ export type IssueSeverity = "error" | "warning" | "info";
37
37
 
38
38
  export interface DoctorIssue {
39
39
  severity: IssueSeverity;
40
- category: "missing_table" | "missing_column" | "type_mismatch" | "missing_constraint" | "schema_stale" | "missing_enum" | "enum_value_mismatch" | "missing_foreign_key" | "sdk_stale" | "sdk_not_generated";
40
+ category: "missing_table" | "missing_column" | "type_mismatch" | "missing_constraint" | "schema_stale" | "missing_enum" | "enum_value_mismatch" | "missing_foreign_key" | "sdk_stale";
41
41
  table?: string;
42
42
  column?: string;
43
43
  expected?: string;
@@ -61,29 +61,19 @@ export function getExpectedColumnType(prop: Property): string | null {
61
61
  const sp = prop as StringProperty;
62
62
  if (sp.enum) return "USER-DEFINED"; // pgEnum → USER-DEFINED in information_schema
63
63
  if ("isId" in sp && sp.isId === "uuid") return "uuid";
64
- if (sp.columnType === "uuid") return "uuid";
65
- // A markdown/multiline string compiles to `text`, not varchar — the
66
- // generator treats those UI hints as column-type signals, so the
67
- // expectation here must too or every such column reads as drift.
68
- if (sp.columnType === "text" || sp.ui?.markdown || sp.ui?.multiline) return "text";
64
+ if (sp.columnType === "text") return "text";
69
65
  if (sp.columnType === "char") return "character";
70
66
  return "character varying";
71
67
  }
72
68
  case "number": {
73
69
  const np = prop as NumberProperty;
74
- if (np.columnType) {
75
- // The generator passes any columnType straight through to drizzle,
76
- // so mirror that rather than enumerating a subset (which reported
77
- // drift for anything unlisted, e.g. smallint). Serial types are
78
- // integers with a sequence default; information_schema reports the
79
- // underlying width.
80
- const serialWidths: Record<string, string> = {
81
- serial: "integer",
82
- bigserial: "bigint",
83
- smallserial: "smallint"
84
- };
85
- return serialWidths[np.columnType] ?? np.columnType;
86
- }
70
+ if (np.columnType === "double precision") return "double precision";
71
+ if (np.columnType === "real") return "real";
72
+ if (np.columnType === "bigint") return "bigint";
73
+ if (np.columnType === "serial") return "integer"; // serial is integer under the hood
74
+ if (np.columnType === "bigserial") return "bigint";
75
+ if (np.columnType === "integer") return "integer";
76
+ if (np.columnType === "numeric") return "numeric";
87
77
  if (np.validation?.integer || ("isId" in np && np.isId)) return "integer";
88
78
  return "numeric";
89
79
  }
@@ -211,18 +201,15 @@ export async function checkCollectionsVsSdk(
211
201
  ): Promise<{ passed: boolean; issues: DoctorIssue[] }> {
212
202
  const issues: DoctorIssue[] = [];
213
203
 
214
- // The typed SDK is opt-in — nothing in a scaffolded project imports it until
215
- // you choose to. A project that never generated one isn't drifting, so report
216
- // it as information rather than a warning; otherwise `doctor` can never come
217
- // back clean on a fresh project and users learn to ignore its output.
204
+ // Check if SDK file exists
218
205
  if (!fs.existsSync(sdkFilePath)) {
219
206
  issues.push({
220
- severity: "info",
221
- category: "sdk_not_generated",
222
- message: "Typed SDK not generated (optional).",
223
- fix: "Run `rebase generate-sdk` if you want typed collection access"
207
+ severity: "warning",
208
+ category: "sdk_stale",
209
+ message: `Generated SDK typedefs file does not exist at "${sdkFilePath}".`,
210
+ fix: "Run `rebase generate-sdk`"
224
211
  });
225
- return { passed: true,
212
+ return { passed: false,
226
213
  issues };
227
214
  }
228
215
 
@@ -644,15 +631,11 @@ export function renderReport(report: DoctorReport): void {
644
631
  }
645
632
 
646
633
  function renderPhase(label: string, passed: boolean, issues: DoctorIssue[]): void {
647
- const errorCount = issues.filter((i) => i.severity === "error").length;
648
- const warnCount = issues.filter((i) => i.severity === "warning").length;
649
- const infoIssues = issues.filter((i) => i.severity === "info");
650
-
651
- // Informational notes don't make a phase unhealthy, so key the header off
652
- // real problems rather than `passed` alone.
653
- if (errorCount === 0 && warnCount === 0) {
634
+ if (passed) {
654
635
  logger.info(` ${chalk.green("✅")} ${label}: ${chalk.green("In sync")}`);
655
636
  } else {
637
+ const errorCount = issues.filter((i) => i.severity === "error").length;
638
+ const warnCount = issues.filter((i) => i.severity === "warning").length;
656
639
  const parts: string[] = [];
657
640
  if (errorCount > 0) parts.push(`${errorCount} error${errorCount > 1 ? "s" : ""}`);
658
641
  if (warnCount > 0) parts.push(`${warnCount} warning${warnCount > 1 ? "s" : ""}`);
@@ -660,14 +643,7 @@ function renderPhase(label: string, passed: boolean, issues: DoctorIssue[]): voi
660
643
  }
661
644
  logger.info("");
662
645
 
663
- // Notes render as a quiet one-liner, not a full drift box.
664
- for (const issue of infoIssues) {
665
- const fixPart = issue.fix ? chalk.gray(` — ${issue.fix}`) : "";
666
- logger.info(` ${chalk.gray("ℹ")} ${chalk.gray(issue.message)}${fixPart}`);
667
- logger.info("");
668
- }
669
-
670
- for (const issue of issues.filter((i) => i.severity !== "info")) {
646
+ for (const issue of issues) {
671
647
  const severityIcon = issue.severity === "error" ? chalk.red("✗") : chalk.yellow("⚠");
672
648
  const categoryLabel = formatCategory(issue.category);
673
649
  logger.info(` ${chalk.gray("┌─")} ${severityIcon} ${chalk.bold(categoryLabel)} ${chalk.gray("─".repeat(Math.max(0, 42 - categoryLabel.length)))}`);
@@ -698,8 +674,7 @@ function formatCategory(cat: DoctorIssue["category"]): string {
698
674
  missing_enum: "Missing Enum",
699
675
  enum_value_mismatch: "Enum Value Mismatch",
700
676
  missing_foreign_key: "Missing Foreign Key",
701
- sdk_stale: "Stale SDK Types",
702
- sdk_not_generated: "SDK Types Not Generated"
677
+ sdk_stale: "Stale SDK Types"
703
678
  };
704
679
  return labels[cat];
705
680
  }
@@ -30,7 +30,6 @@ async function main() {
30
30
  "--force": Boolean,
31
31
  "--schema": String,
32
32
  "--data-inference": Boolean,
33
- "--no-data-inference": Boolean,
34
33
  "-o": "--output",
35
34
  "-c": "--collections",
36
35
  "-f": "--force"
@@ -167,14 +166,8 @@ async function main() {
167
166
  logger.info(chalk.blue(`Found ${tablesMap.size} tables (including ${joinTables.size} detected join tables).`));
168
167
 
169
168
  let runDataInference = false;
170
- if (args["--no-data-inference"]) {
171
- runDataInference = false;
172
- } else if (args["--data-inference"] !== undefined) {
169
+ if (args["--data-inference"] !== undefined) {
173
170
  runDataInference = args["--data-inference"];
174
- } else if (!process.stdin.isTTY) {
175
- // No terminal to answer the question below (scaffolding scripts, CI,
176
- // `rebase init --introspect`) — asking would hang forever.
177
- logger.info(chalk.gray("Skipping data inference (non-interactive run; pass --data-inference to enable)."));
178
171
  } else {
179
172
  const rl = readline.createInterface({
180
173
  input: process.stdin,
@@ -243,17 +236,7 @@ async function main() {
243
236
  const merged = mergeIndexContent(existing, generatedFiles);
244
237
  fs.writeFileSync(indexPath, merged, "utf-8");
245
238
  } else {
246
- // --force replaces collections derived from the database, but the
247
- // directory can also hold hand-written ones with no table in the
248
- // introspected schema (the auth users collection lives in
249
- // "rebase"). The backend discovers the whole directory, so an
250
- // index listing only introspected tables would silently drop them
251
- // from the admin UI while the API still served them.
252
- const siblings = fs.readdirSync(outDir)
253
- .filter(f => f.endsWith(".ts") && f !== "index.ts")
254
- .map(f => f.replace(/\.ts$/, ""));
255
- const allFiles = [...new Set([...generatedFiles, ...siblings])];
256
- const indexContent = generateIndexContent(allFiles);
239
+ const indexContent = generateIndexContent(generatedFiles);
257
240
  fs.writeFileSync(indexPath, indexContent, "utf-8");
258
241
  }
259
242
  logger.info(chalk.green(` ✓ ${indexPath}`));
@@ -1,7 +1,7 @@
1
1
  import { describe, expect, it } from "@jest/globals";
2
2
  import type { CollectionConfig } from "@rebasepro/types";
3
3
 
4
- import { checkPolicyDrift, parseExpectedPolicies, formatPolicyDrift, hasDrift, dropOrphanedPolicies, isGeneratedPolicyName, type PolicyRef, type Queryable } from "./policy-drift";
4
+ import { checkPolicyDrift, parseExpectedPolicies, formatPolicyDrift, hasDrift, type PolicyRef, type Queryable } from "./policy-drift";
5
5
  import { generatePostgresPoliciesDdl } from "../schema/generate-postgres-ddl-logic";
6
6
 
7
7
  function collection(slug: string): CollectionConfig {
@@ -154,108 +154,3 @@ describe("checkPolicyDrift", () => {
154
154
  expect(drift.missing.length).toBeGreaterThan(0);
155
155
  });
156
156
  });
157
-
158
- describe("isGeneratedPolicyName", () => {
159
- it("recognises the generator's own shape", () => {
160
- expect(isGeneratedPolicyName("documents_insert_a1b2c3d", "documents")).toBe(true);
161
- // One rule spanning several operations appends the operation index.
162
- expect(isGeneratedPolicyName("documents_update_a1b2c3d_1", "documents")).toBe(true);
163
- });
164
-
165
- it("does not claim names a human could have written", () => {
166
- expect(isGeneratedPolicyName("owner_access", "documents")).toBe(false);
167
- expect(isGeneratedPolicyName("documents_default_admin_read", "documents")).toBe(false);
168
- // Right shape, wrong table — belongs to something else.
169
- expect(isGeneratedPolicyName("teams_insert_a1b2c3d", "documents")).toBe(false);
170
- // A digest is 7 lowercase hex characters, nothing else.
171
- expect(isGeneratedPolicyName("documents_insert_notahex", "documents")).toBe(false);
172
- expect(isGeneratedPolicyName("documents_grant_a1b2c3d", "documents")).toBe(false);
173
- });
174
- });
175
-
176
- describe("dropOrphanedPolicies", () => {
177
- /** Records the DDL issued so the test can assert on what was dropped. */
178
- function recordingDb(rows: Record<string, unknown>[]) {
179
- const executed: string[] = [];
180
- const db: Queryable = {
181
- query: async (text: string) => {
182
- if (!/^SELECT/i.test(text)) executed.push(text);
183
- return { rows: rows as never[] };
184
- }
185
- };
186
- return { db, executed };
187
- }
188
-
189
- it("drops the policy a rule edit superseded", async () => {
190
- // The reported failure: tightening a rule renames its policy, and the
191
- // permissive original stays live and keeps ORing itself back in.
192
- const cols = [collection("documents")];
193
- const expected = parseExpectedPolicies(generatePostgresPoliciesDdl(cols));
194
- const stale = {
195
- schemaname: "public", tablename: "documents", policyname: "documents_insert_dead1ee",
196
- roles: ["public"], cmd: "INSERT", qual: null, with_check: "true"
197
- };
198
- const live = [...expected.map((p) => liveRow(p)), stale];
199
-
200
- const drift = await checkPolicyDrift(dbWith(live), cols);
201
- const { db, executed } = recordingDb(live);
202
- const { dropped, kept } = await dropOrphanedPolicies(db, drift, cols);
203
-
204
- expect(dropped).toHaveLength(1);
205
- expect(dropped[0].name).toBe("documents_insert_dead1ee");
206
- expect(kept).toHaveLength(0);
207
- expect(executed).toEqual([
208
- 'DROP POLICY IF EXISTS "documents_insert_dead1ee" ON "public"."documents"'
209
- ]);
210
- });
211
-
212
- it("leaves a hand-written policy alone and reports it instead", async () => {
213
- const cols = [collection("documents")];
214
- const expected = parseExpectedPolicies(generatePostgresPoliciesDdl(cols));
215
- const live = [
216
- ...expected.map((p) => liveRow(p)),
217
- { schemaname: "public", tablename: "documents", policyname: "ops_break_glass", roles: ["public"], cmd: "ALL", qual: "true", with_check: null }
218
- ];
219
-
220
- const drift = await checkPolicyDrift(dbWith(live), cols);
221
- const { db, executed } = recordingDb(live);
222
- const { dropped, kept } = await dropOrphanedPolicies(db, drift, cols);
223
-
224
- expect(dropped).toHaveLength(0);
225
- expect(kept.map((p) => p.name)).toEqual(["ops_break_glass"]);
226
- expect(executed).toEqual([]);
227
- });
228
-
229
- it("never touches a table the collections do not describe", async () => {
230
- // Another application sharing the schema owns this table; a
231
- // generator-shaped name there is coincidence, not our leftover.
232
- const cols = [collection("documents")];
233
- const expected = parseExpectedPolicies(generatePostgresPoliciesDdl(cols));
234
- const live = [
235
- ...expected.map((p) => liveRow(p)),
236
- { schemaname: "public", tablename: "legacy", policyname: "legacy_select_a1b2c3d", roles: ["public"], cmd: "SELECT", qual: "true", with_check: null }
237
- ];
238
-
239
- const drift = await checkPolicyDrift(dbWith(live), cols);
240
- const { db, executed } = recordingDb(live);
241
- const { dropped, kept } = await dropOrphanedPolicies(db, drift, cols);
242
-
243
- expect(dropped).toHaveLength(0);
244
- expect(kept.map((p) => p.name)).toEqual(["legacy_select_a1b2c3d"]);
245
- expect(executed).toEqual([]);
246
- });
247
-
248
- it("does nothing when the database already matches", async () => {
249
- const cols = [collection("documents")];
250
- const expected = parseExpectedPolicies(generatePostgresPoliciesDdl(cols));
251
- const live = expected.map((p) => liveRow(p));
252
-
253
- const drift = await checkPolicyDrift(dbWith(live), cols);
254
- const { db, executed } = recordingDb(live);
255
- const { dropped, kept } = await dropOrphanedPolicies(db, drift, cols);
256
-
257
- expect(dropped).toHaveLength(0);
258
- expect(kept).toHaveLength(0);
259
- expect(executed).toEqual([]);
260
- });
261
- });
@@ -192,62 +192,6 @@ export async function checkPolicyDrift(
192
192
  return drift;
193
193
  }
194
194
 
195
- /**
196
- * Does this name look like one the generator produced for this table?
197
- *
198
- * Unnamed rules compile to `<table>_<op>_<sha1[0:7]>` (plus `_<idx>` when one
199
- * rule spans several operations), and the hash covers the rule's semantics — so
200
- * *editing* a rule renames its policy. The policy under the old name is left
201
- * behind by `db push`, which only DROPs the names it is about to CREATE, and
202
- * Postgres ORs PERMISSIVE policies together: a superseded `USING (true)` keeps
203
- * granting everything no matter how tight its replacement is.
204
- *
205
- * Matching the shape is what makes dropping them safe. A hand-written policy
206
- * would have to collide with a 7-hex digest to be mistaken for generated one;
207
- * a policy named anything else is left alone and merely reported, because a
208
- * custom name is indistinguishable from one someone wrote in SQL on purpose.
209
- */
210
- export function isGeneratedPolicyName(name: string, table: string): boolean {
211
- return new RegExp(`^${table.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}_(select|insert|update|delete|all)_[0-9a-f]{7}(_\\d+)?$`)
212
- .test(name);
213
- }
214
-
215
- export interface OrphanCleanup {
216
- /** Superseded generated policies that were dropped. */
217
- dropped: PolicyRef[];
218
- /** Orphans left in place because their names are not generator-shaped. */
219
- kept: PolicyRef[];
220
- }
221
-
222
- /**
223
- * Drop the policies an earlier push superseded but never removed.
224
- *
225
- * Only touches tables the collections describe — a table with no expected
226
- * policy is not ours to reconcile, and scanning by schema alone would sweep up
227
- * policies belonging to something else sharing the database.
228
- */
229
- export async function dropOrphanedPolicies(
230
- client: Queryable,
231
- drift: PolicyDrift,
232
- collections: CollectionConfig[]
233
- ): Promise<OrphanCleanup> {
234
- const expected = parseExpectedPolicies(generatePostgresPoliciesDdl(collections));
235
- const managed = new Set(expected.map((p) => `${p.schema}.${p.table}`));
236
-
237
- const cleanup: OrphanCleanup = { dropped: [], kept: [] };
238
- for (const p of drift.orphaned) {
239
- if (!managed.has(`${p.schema}.${p.table}`) || !isGeneratedPolicyName(p.name, p.table)) {
240
- cleanup.kept.push(p);
241
- continue;
242
- }
243
- // Identifiers are quoted, and the name came from pg_policies rather than
244
- // from user input, so it is already a valid identifier.
245
- await client.query(`DROP POLICY IF EXISTS "${p.name}" ON "${p.schema}"."${p.table}"`);
246
- cleanup.dropped.push(p);
247
- }
248
- return cleanup;
249
- }
250
-
251
195
  export const hasDrift = (d: PolicyDrift): boolean =>
252
196
  d.missing.length > 0 || d.orphaned.length > 0 || d.diverged.length > 0;
253
197