@aotter/mantle 0.2.0-alpha.5 → 0.2.0-alpha.6

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.
Files changed (169) hide show
  1. package/README.md +2 -2
  2. package/dist/admin/createAdminSurface.d.ts +3 -0
  3. package/dist/admin/createAdminSurface.d.ts.map +1 -1
  4. package/dist/admin/createAdminSurface.js +51 -8
  5. package/dist/admin/createAdminSurface.js.map +1 -1
  6. package/dist/admin/extensions.d.ts +290 -0
  7. package/dist/admin/extensions.d.ts.map +1 -0
  8. package/dist/admin/extensions.js +532 -0
  9. package/dist/admin/extensions.js.map +1 -0
  10. package/dist/admin/index.d.ts +1 -0
  11. package/dist/admin/index.d.ts.map +1 -1
  12. package/dist/admin/index.js +1 -0
  13. package/dist/admin/index.js.map +1 -1
  14. package/dist/auth/buildAuth.d.ts +3 -1
  15. package/dist/auth/buildAuth.d.ts.map +1 -1
  16. package/dist/auth/buildAuth.js +3 -2
  17. package/dist/auth/buildAuth.js.map +1 -1
  18. package/dist/auth/callerResolver.d.ts +4 -0
  19. package/dist/auth/callerResolver.d.ts.map +1 -1
  20. package/dist/auth/callerResolver.js +4 -1
  21. package/dist/auth/callerResolver.js.map +1 -1
  22. package/dist/auth/createMantleAuth.d.ts.map +1 -1
  23. package/dist/auth/createMantleAuth.js +3 -2
  24. package/dist/auth/createMantleAuth.js.map +1 -1
  25. package/dist/auth/db.d.ts +1 -0
  26. package/dist/auth/db.d.ts.map +1 -1
  27. package/dist/auth/db.js +6 -3
  28. package/dist/auth/db.js.map +1 -1
  29. package/dist/bun/index.d.ts +0 -44
  30. package/dist/bun/index.d.ts.map +1 -1
  31. package/dist/bun/index.js +0 -84
  32. package/dist/bun/index.js.map +1 -1
  33. package/dist/cli/generate.js +3 -3
  34. package/dist/cli/generate.js.map +1 -1
  35. package/dist/cli/preset.d.ts.map +1 -1
  36. package/dist/cli/preset.js +80 -28
  37. package/dist/cli/preset.js.map +1 -1
  38. package/dist/cloudflare/index.d.ts +4 -0
  39. package/dist/cloudflare/index.d.ts.map +1 -1
  40. package/dist/cloudflare/index.js +2 -0
  41. package/dist/cloudflare/index.js.map +1 -1
  42. package/dist/core/dialect.d.ts +13 -1
  43. package/dist/core/dialect.d.ts.map +1 -1
  44. package/dist/core/driver.d.ts +7 -0
  45. package/dist/core/driver.d.ts.map +1 -1
  46. package/dist/core/runtime/createRuntime.js +1 -1
  47. package/dist/core/runtime/createRuntime.js.map +1 -1
  48. package/dist/core/sessionUser.d.ts +14 -0
  49. package/dist/core/sessionUser.d.ts.map +1 -0
  50. package/dist/core/sessionUser.js +4 -0
  51. package/dist/core/sessionUser.js.map +1 -0
  52. package/dist/core/sql/allowlist.d.ts +2 -0
  53. package/dist/core/sql/allowlist.d.ts.map +1 -1
  54. package/dist/core/sql/allowlist.js +43 -11
  55. package/dist/core/sql/allowlist.js.map +1 -1
  56. package/dist/core/sql/ast.js +1 -1
  57. package/dist/core/sql/ast.js.map +1 -1
  58. package/dist/core/sql/compile.js +1 -1
  59. package/dist/core/sql/compile.js.map +1 -1
  60. package/dist/core/sql/policy.d.ts +2 -0
  61. package/dist/core/sql/policy.d.ts.map +1 -1
  62. package/dist/core/sql/policy.js +25 -6
  63. package/dist/core/sql/policy.js.map +1 -1
  64. package/dist/core/sql/run.d.ts +0 -8
  65. package/dist/core/sql/run.d.ts.map +1 -1
  66. package/dist/core/sql/run.js +152 -35
  67. package/dist/core/sql/run.js.map +1 -1
  68. package/dist/d1/executor.d.ts +2 -0
  69. package/dist/d1/executor.d.ts.map +1 -1
  70. package/dist/d1/executor.js +6 -1
  71. package/dist/d1/executor.js.map +1 -1
  72. package/dist/postgres/adapter.d.ts +5 -2
  73. package/dist/postgres/adapter.d.ts.map +1 -1
  74. package/dist/postgres/adapter.js +7 -1
  75. package/dist/postgres/adapter.js.map +1 -1
  76. package/dist/postgres/compile/index.d.ts +1 -1
  77. package/dist/postgres/compile/index.js +1 -1
  78. package/dist/postgres/driver.d.ts +38 -21
  79. package/dist/postgres/driver.d.ts.map +1 -1
  80. package/dist/postgres/driver.js +100 -24
  81. package/dist/postgres/driver.js.map +1 -1
  82. package/dist/postgres/executor.d.ts +8 -0
  83. package/dist/postgres/executor.d.ts.map +1 -1
  84. package/dist/postgres/executor.js +40 -13
  85. package/dist/postgres/executor.js.map +1 -1
  86. package/dist/postgres/index.d.ts +2 -1
  87. package/dist/postgres/index.d.ts.map +1 -1
  88. package/dist/postgres/index.js +1 -0
  89. package/dist/postgres/index.js.map +1 -1
  90. package/dist/postgres/lower.d.ts.map +1 -1
  91. package/dist/postgres/lower.js +3 -8
  92. package/dist/postgres/lower.js.map +1 -1
  93. package/dist/postgres/print.d.ts.map +1 -1
  94. package/dist/postgres/print.js +2 -15
  95. package/dist/postgres/print.js.map +1 -1
  96. package/dist/postgres/session.d.ts +9 -0
  97. package/dist/postgres/session.d.ts.map +1 -0
  98. package/dist/postgres/session.js +111 -0
  99. package/dist/postgres/session.js.map +1 -0
  100. package/dist/postgres/storage.d.ts +14 -1
  101. package/dist/postgres/storage.d.ts.map +1 -1
  102. package/dist/postgres/storage.js +136 -54
  103. package/dist/postgres/storage.js.map +1 -1
  104. package/dist/postgres/validator.d.ts +4 -3
  105. package/dist/postgres/validator.d.ts.map +1 -1
  106. package/dist/postgres/validator.js +13 -6
  107. package/dist/postgres/validator.js.map +1 -1
  108. package/dist/spec/domain/model/ManifestGrammar.d.ts +4 -0
  109. package/dist/spec/domain/model/ManifestGrammar.d.ts.map +1 -1
  110. package/dist/spec/domain/model/ManifestGrammar.js +4 -0
  111. package/dist/spec/domain/model/ManifestGrammar.js.map +1 -1
  112. package/dist/spec/domain/service/SchemaAdminUiChecker.d.ts +2 -0
  113. package/dist/spec/domain/service/SchemaAdminUiChecker.d.ts.map +1 -1
  114. package/dist/spec/domain/service/SchemaAdminUiChecker.js +50 -6
  115. package/dist/spec/domain/service/SchemaAdminUiChecker.js.map +1 -1
  116. package/dist/spec/domain/service/ViewAdminUiChecker.d.ts +1 -1
  117. package/dist/spec/domain/service/ViewAdminUiChecker.d.ts.map +1 -1
  118. package/dist/spec/domain/service/ViewAdminUiChecker.js +7 -2
  119. package/dist/spec/domain/service/ViewAdminUiChecker.js.map +1 -1
  120. package/dist/spec/infrastructure/sql/compilePlan.d.ts.map +1 -1
  121. package/dist/spec/infrastructure/sql/compilePlan.js +5 -0
  122. package/dist/spec/infrastructure/sql/compilePlan.js.map +1 -1
  123. package/dist/spec/kernel/diagnostic.d.ts +1 -1
  124. package/dist/spec/kernel/diagnostic.d.ts.map +1 -1
  125. package/dist/spec/kernel/diagnostic.js +5 -0
  126. package/dist/spec/kernel/diagnostic.js.map +1 -1
  127. package/dist/testing/cases/corpus.d.ts +2 -0
  128. package/dist/testing/cases/corpus.d.ts.map +1 -1
  129. package/dist/testing/cases/corpus.js +7 -5
  130. package/dist/testing/cases/corpus.js.map +1 -1
  131. package/dist/testing/cases/policy.d.ts +14 -1
  132. package/dist/testing/cases/policy.d.ts.map +1 -1
  133. package/dist/testing/cases/policy.js +3 -2
  134. package/dist/testing/cases/policy.js.map +1 -1
  135. package/dist/testing/cases/printer.d.ts.map +1 -1
  136. package/dist/testing/cases/printer.js +3 -1
  137. package/dist/testing/cases/printer.js.map +1 -1
  138. package/dist/testing/cases/report-view.d.ts.map +1 -1
  139. package/dist/testing/cases/report-view.js +18 -0
  140. package/dist/testing/cases/report-view.js.map +1 -1
  141. package/docs/adr/0037-postgresql-is-the-reference-dialect.md +2 -1
  142. package/docs/adr/0039-postgresql-is-native.md +130 -0
  143. package/docs/adr/README.md +2 -0
  144. package/docs/adr/adr-lite-1376-admin-extensions.md +330 -0
  145. package/docs/examples/commerce-inventory.md +18 -1
  146. package/docs/examples/reference-service/package.json +2 -2
  147. package/docs/handbook/cloudflare/authentication.md +3 -3
  148. package/docs/handbook/cloudflare/deploy-and-operate.md +4 -1
  149. package/docs/handbook/concepts/runtime-and-adapters.md +74 -33
  150. package/docs/handbook/concepts/views.md +1 -1
  151. package/docs/handbook/guides/admin-extensions.md +191 -0
  152. package/docs/handbook/guides/admin-ui.md +2 -1
  153. package/docs/handbook/navigation.json +2 -1
  154. package/docs/handbook/reference/diagnostics.md +1 -0
  155. package/docs/handbook/reference/procedure.md +2 -1
  156. package/docs/handbook/reference/schema.md +6 -3
  157. package/docs/handbook/reference/surface.md +6 -2
  158. package/docs/handbook/reference/view.md +7 -5
  159. package/docs/handbook/releases/index.md +78 -4
  160. package/docs/handbook/start/project-and-cli.md +20 -12
  161. package/docs/skills/develop/SKILL.md +8 -2
  162. package/docs/skills/provision/SKILL.md +4 -1
  163. package/docs/skills/update/SKILL.md +3 -0
  164. package/docs/upgrade-0.1-to-0.2.md +1 -1
  165. package/package.json +6 -5
  166. package/dist/postgres/textRows.d.ts +0 -10
  167. package/dist/postgres/textRows.d.ts.map +0 -1
  168. package/dist/postgres/textRows.js +0 -44
  169. package/dist/postgres/textRows.js.map +0 -1
@@ -1,6 +1,6 @@
1
- // The PostgreSQL dialect's lowering (ADR-0035 decision 3): what Core's policy rewriter hands a dialect to spell. Most of Mantle
2
- // SQL is PostgreSQL already, so this is short: casts and binds typed, the SQLite vocabulary of the portable subset spelled in
3
- // PostgreSQL, and the site time zone made explicit. AST in, AST out, no parser.
1
+ // The PostgreSQL dialect's lowering (ADR-0035 decision 3): what Core's policy rewriter hands a dialect to spell. Mantle SQL on
2
+ // PostgreSQL is PostgreSQL (ADR-0039), so this is short: casts and binds typed, the few Mantle-defined functions spelled, and
3
+ // the site time zone made explicit. AST in, AST out, no parser.
4
4
  import { SqlRefusal as Refused } from "../spec/domain/index.js";
5
5
  import { S, num } from "../core/sql/ast.js";
6
6
  import { encodeDate, encodeNumeric, encodeTimestamptz, decodeDate, decodeNumeric, decodeTimestamptz } from "../d1/codec.js";
@@ -61,8 +61,6 @@ export function pgLowering(timeZone) {
61
61
  // in the site time zone, as D1 computes them
62
62
  case "date_trunc": return fn("date_trunc", [args[0], scope.tx(args[1]), zone]);
63
63
  case "extract": return sql(`CAST(extract(${strConst(args[0])} FROM __ts AT TIME ZONE ${lit(timeZone)}) AS int8)`, { __ts: scope.tx(args[1]) });
64
- // SQLite's columns (key, value, type, id), so the portable subset's json_each reads the same: see `_mantle_json_each`
65
- case "json_each": return fn("_mantle_json_each", [cast(scope.tx(args[0]), "json")]);
66
64
  // PostgreSQL leaves an aggregate's input order open; ordering by the value (an object by its key) keeps it deterministic.
67
65
  // ponytail: D1 aggregates in scan order, so the two engines may order an array differently; neither order is promised
68
66
  // json has no ordering of its own, so the order is jsonb's; a DISTINCT aggregate may order only by its argument
@@ -143,9 +141,6 @@ export function pgLowering(timeZone) {
143
141
  if (text !== undefined)
144
142
  return cast(str(decodeNumeric(encodeNumeric(text, p, s), s)), `numeric(${p},${s})`);
145
143
  }
146
- // a bigint has no cast to bool in PostgreSQL; `_mantle_bool` gives PostgreSQL's int4, text and numeric rules for every type
147
- if (t === "bool")
148
- return fn("_mantle_bool", [scope.tx(n.arg)]);
149
144
  return { TypeCast: { ...n, arg: scope.tx(n.arg) } };
150
145
  },
151
146
  sublink: (out) => ({ SubLink: out }),
@@ -1 +1 @@
1
- {"version":3,"file":"lower.js","sourceRoot":"","sources":["../../src/postgres/lower.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lower.js","sourceRoot":"","sources":["../../src/postgres/lower.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../../src/postgres/print.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,MAAM,WAAW,OAAO;IAAG,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAA;CAAE;AAmBpE,wBAAgB,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM,CAEpC;AAED,mHAAmH;AACnH,wBAAgB,UAAU,CAAC,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW5E;AAKD,uFAAuF;AACvF,wBAAgB,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,CAkDjF"}
1
+ {"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../../src/postgres/print.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,IAAI,CAAC,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,MAAM,WAAW,OAAO;IAAG,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAA;CAAE;AAmBpE,wBAAgB,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM,CAEpC;AAED,mHAAmH;AACnH,wBAAgB,UAAU,CAAC,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAW5E;AAED,uFAAuF;AACvF,wBAAgB,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,CA8CjF"}
@@ -1,11 +1,7 @@
1
1
  /**
2
2
  * The printer: pgsql-deparser as it is, plus `Raw` (the lowering's text templates) and one pass over the physical AST that
3
- * gives PostgreSQL the types SQLite's affinity never needed (`typed`):
4
- * - a value written to a column is cast to the column's type (`j.value ->> 'reps'` is text; the column is int8);
5
- * - `a || b` concatenates text, as it does on D1 (`2 * 3 || 4` is '64'; PostgreSQL has no int || int);
6
- * - `x ->> k` is `_mantle_jget(x, k)`, which takes a json(b) or a JSON text, a key, an index or a `$` path, as SQLite does;
7
- * - an ORDER BY key without NULLS FIRST/LAST states the rule Core pages every View by (run.ts): NULL first ascending, last
8
- * descending, so a LIMIT picks the same rows on both engines (PostgreSQL's own default is the reverse).
3
+ * gives a write the column's type (`typed`): a value written to a column is cast to the column's type (`j.value ->> 'reps'` is
4
+ * text; the column is int8). Everything else prints as written: `||`, `->>` and CAST mean what PostgreSQL says (ADR-0039).
9
5
  */
10
6
  import { Deparser } from "pgsql-deparser";
11
7
  import { S, paren, parenthesized } from "../core/sql/ast.js";
@@ -48,8 +44,6 @@ export function columnType(s, col) {
48
44
  const t = s.fields[col];
49
45
  return t === "geo" ? undefined : t;
50
46
  }
51
- const name = (op) => op.name?.at(-1)?.String?.sval;
52
- const textOf = (x) => ({ TypeCast: { arg: x, typeName: { names: [S("text")], typemod: -1 } } });
53
47
  /** The physical AST with PostgreSQL's types made explicit (see the module comment). */
54
48
  export function typed(ast, schemas) {
55
49
  const walk = (v) => {
@@ -58,13 +52,6 @@ export function typed(ast, schemas) {
58
52
  if (!v || typeof v !== "object")
59
53
  return v;
60
54
  const out = Object.fromEntries(Object.entries(v).map(([k, c]) => [k, walk(c)]));
61
- const e = out.A_Expr;
62
- if (e?.kind === "AEXPR_OP" && name(e) === "->>")
63
- return { FuncCall: { funcname: [S("_mantle_jget")], args: [e.lexpr, e.rexpr], funcformat: "COERCE_EXPLICIT_CALL" } };
64
- if (e?.kind === "AEXPR_OP" && name(e) === "||")
65
- return { A_Expr: { ...e, lexpr: textOf(e.lexpr), rexpr: textOf(e.rexpr) } };
66
- if (out.SortBy?.sortby_nulls === "SORTBY_NULLS_DEFAULT")
67
- out.SortBy.sortby_nulls = out.SortBy.sortby_dir === "SORTBY_DESC" ? "SORTBY_NULLS_LAST" : "SORTBY_NULLS_FIRST";
68
55
  if (out.InsertStmt)
69
56
  insert(out.InsertStmt);
70
57
  if (out.UpdateStmt)
@@ -1 +1 @@
1
- {"version":3,"file":"print.js","sourceRoot":"","sources":["../../src/postgres/print.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIlC,MAAM,UAAW,SAAQ,QAAQ;IACtB,MAAM,CAAC,CAAI,EAAE,GAAQ,IAAI,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACzF,QAAQ,CAAC,CAAI,EAAE,GAAQ,IAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/F,WAAW,CAAC,CAAI,EAAE,GAAQ,IAAI,OAAO,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC,CAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACxG,OAAO,CAAC,CAAI,EAAE,GAAQ,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IACrG,+IAA+I;IACtI,QAAQ,CAAC,CAAI,EAAE,GAAQ;QAC9B,6FAA6F;QAC7F,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,KAAK,YAAY,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,KAAK,aAAa;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC7J,OAAO,IAAI,KAAK,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,EAAW,EAAE,GAAG,CAAC,GAAG,CAAC;IACjF,CAAC;IACD,8GAA8G;IAC9G,GAAG,CAAC,CAAU,EAAE,GAAQ;QACtB,OAAO,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC;IACvG,CAAC;CACF;AAED,MAAM,UAAU,KAAK,CAAC,GAAM;IAC1B,OAAO,IAAI,UAAU,CAAC,CAAC,GAAG,CAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;AACxE,CAAC;AAED,mHAAmH;AACnH,MAAM,UAAU,UAAU,CAAC,CAAgB,EAAE,GAAW;IACtD,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,IAAI,CAAC;QAAC,KAAK,WAAW,CAAC;QAAC,KAAK,QAAQ,CAAC,CAAC,OAAO,MAAM,CAAC;QAC1D,KAAK,SAAS,CAAC,CAAC,OAAO,SAAS,CAAC;QACjC,KAAK,YAAY,CAAC;QAAC,KAAK,YAAY,CAAC,CAAC,OAAO,aAAa,CAAC;IAC7D,CAAC;IACD,IAAI,GAAG,KAAK,CAAC,CAAC,KAAK;QAAE,OAAO,MAAM,CAAC;IACnC,MAAM,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,KAAK,KAAK;QAAE,OAAO,MAAM,CAAC;IACtD,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACxB,OAAO,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,IAAI,GAAG,CAAC,EAAK,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC;AACtD,MAAM,MAAM,GAAG,CAAC,CAAI,EAAK,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAEtG,uFAAuF;AACvF,MAAM,UAAU,KAAK,CAAC,GAAM,EAAE,OAAgD;IAC5E,MAAM,IAAI,GAAG,CAAC,CAAM,EAAO,EAAE;QAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;YAAE,OAAO,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAQ,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;QACrB,IAAI,CAAC,EAAE,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK;YAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,sBAAsB,EAAE,EAAE,CAAC;QACtK,IAAI,CAAC,EAAE,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;YAAE,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QAC5H,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,KAAK,sBAAsB;YAAE,GAAG,CAAC,MAAM,CAAC,YAAY,GAAG,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,aAAa,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,oBAAoB,CAAC;QACxK,IAAI,GAAG,CAAC,UAAU;YAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3C,IAAI,GAAG,CAAC,UAAU;YAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACvF,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAE,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC7H,MAAM,EAAE,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,GAAM,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACpH,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,OAAwB,EAAE,EAAE;QACzD,KAAK,MAAM,CAAC,IAAI,OAAO,IAAI,EAAE;YAAE,IAAI,CAAC,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG;gBAAE,CAAC,CAAC,SAAS,CAAC,GAAG,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC1I,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,CAAC,CAAI,EAAE,EAAE;QACtB,MAAM,KAAK,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAiB,CAAC;QAC3C,MAAM,IAAI,GAAa,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACtE,MAAM,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC;QACrC,MAAM,IAAI,GAAQ,GAAG,EAAE,UAAU,IAAI,EAAE,CAAC;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC;QACxD,MAAM,IAAI,GAAG,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC;QAClD,oGAAoG;QACpG,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC;QACzC,gDAAgD;QAChD,MAAM,KAAK,GAAG,CAAC,CAAgB,EAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxG,MAAM,KAAK,GAAG,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC;QAC/F,0GAA0G;QAC1G,IAAI,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,IAAI,EAAE,KAAK,EAAE,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAC3G,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACvE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAE,EAAE,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YACvK,GAAG,CAAC,UAAU,GAAG,CAAC,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QACrJ,CAAC;aAAM,IAAI,GAAG,EAAE,UAAU,IAAI,CAAC,GAAG,CAAC,WAAW;YAAE,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjL,4HAA4H;QAC5H,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,IAAI,KAAK,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,CAAM,EAAO,EAAE;YAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,OAAO;gBAAE,OAAO,CAAC,CAAC;YACvD,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM;gBAAE,OAAO,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;YAC5I,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,UAAU,IAAI,EAAE;YAAE,CAAC,CAAC,SAAS,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACjG,IAAI,CAAC,CAAC,gBAAgB,EAAE,WAAW;YAAE,CAAC,CAAC,gBAAgB,CAAC,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC9G,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"print.js","sourceRoot":"","sources":["../../src/postgres/print.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ import { type PgConnect } from "./driver.js";
2
+ export interface PgSession {
3
+ /** What `postgresStorage`, `pgPool` and `pgDatabaseDriver` take. */
4
+ readonly connect: PgConnect;
5
+ /** Runs `fn` as one request: its operations share one client, ended when `fn` settles (or, if one is in flight, after it). */
6
+ run<T>(fn: () => Promise<T>): Promise<T>;
7
+ }
8
+ export declare function requestScoped(connect: PgConnect): PgSession;
9
+ //# sourceMappingURL=session.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/postgres/session.ts"],"names":[],"mappings":"AAYA,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAEtE,MAAM,WAAW,SAAS;IACxB,oEAAoE;IACpE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAC5B,8HAA8H;IAC9H,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;CAC1C;AAeD,wBAAgB,aAAa,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,CAqF3D"}
@@ -0,0 +1,111 @@
1
+ /**
2
+ * A request is the unit of work (#1379). `requestScoped(connect)` gives one `PgConnect` to every PostgreSQL consumer of a
3
+ * service (the Store, Better Auth's `pgPool`, auth's `pgDatabaseDriver`) and a `run` the host wraps each request in: inside
4
+ * it, every operation reuses one client, opened by the first and ended when the request ends, as a Worker's socket must be.
5
+ * Outside it (boot, a schedule, work that outlives its request) each operation opens its own client, as before.
6
+ *
7
+ * One operation holds the shared client from its `connect()` to its `end()` (a write from BEGIN to COMMIT), so two never
8
+ * interleave inside each other's transaction. One that arrives while it is held opens a client of its own instead of waiting:
9
+ * waiting would deadlock a caller that queries outside a transaction it holds open, and a request with no concurrency (the
10
+ * common one) still uses a single connection.
11
+ */
12
+ import { AsyncLocalStorage } from "node:async_hooks";
13
+ import { sqlState } from "./driver.js";
14
+ // for a client that does not report the protocol's transaction state: what the SQL text says
15
+ const BEGINS = /^\s*(BEGIN|START\s+TRANSACTION)\b/i;
16
+ const ENDS = /^\s*(COMMIT|ROLLBACK|END|ABORT)\s*(;|$)/i;
17
+ const close = (c) => void c?.then((x) => x.end()).catch(() => undefined);
18
+ export function requestScoped(connect) {
19
+ const als = new AsyncLocalStorage();
20
+ const release = (scope, discard) => {
21
+ if (discard || !scope.open) {
22
+ void scope.detach?.then((off) => off(), () => undefined);
23
+ scope.detach = undefined;
24
+ close(scope.client);
25
+ scope.client = undefined;
26
+ }
27
+ scope.busy = false;
28
+ };
29
+ /**
30
+ * The shared client for one operation. Its `end()` hands it back; one left in a transaction, by the protocol's own report
31
+ * when the driver gives it (node-postgres) or else by the SQL it ran, or with a broken socket, is closed.
32
+ */
33
+ const lease = (scope, client) => {
34
+ let inTx = false;
35
+ let broken = false;
36
+ let released = false;
37
+ const track = (text, p) => {
38
+ if (BEGINS.test(text))
39
+ inTx = true;
40
+ // an answer to COMMIT or ROLLBACK, even an error, ends the transaction; an error with no SQLSTATE is the socket's
41
+ p.then(() => { if (ENDS.test(text))
42
+ inTx = false; }, (e) => { if (!sqlState(e))
43
+ broken = true;
44
+ else if (ENDS.test(text))
45
+ inTx = false; });
46
+ return p;
47
+ };
48
+ return {
49
+ pipeline: client.pipeline,
50
+ ...(client.execute ? { execute: (s) => track(s.text, client.execute(s)) } : {}),
51
+ query: ((config, values) => track(typeof config === "string" ? config : config.text, client.query(config, values))),
52
+ async end() {
53
+ if (released)
54
+ return;
55
+ released = true;
56
+ // ponytail: a transaction left open is closed with its client rather than rolled back here, which costs the request a
57
+ // reconnect only on a path that already failed
58
+ const status = client.getTransactionStatus?.();
59
+ release(scope, broken || (status != null ? status !== "I" : inTx));
60
+ },
61
+ };
62
+ };
63
+ return {
64
+ async connect() {
65
+ const scope = als.getStore();
66
+ if (!scope?.open || scope.busy)
67
+ return connect();
68
+ scope.busy = true;
69
+ try {
70
+ if (!scope.client) {
71
+ let off = () => { };
72
+ const shared = connect().then((c) => {
73
+ // a socket that fails while the client sits idle between operations: the next one opens another, and node-postgres
74
+ // does not throw the event for want of a listener
75
+ const on = c;
76
+ const onError = () => {
77
+ if (scope.client === shared)
78
+ scope.client = undefined;
79
+ off();
80
+ void c.end().catch(() => undefined);
81
+ };
82
+ on.on?.("error", onError);
83
+ off = () => void on.off?.("error", onError);
84
+ return c;
85
+ });
86
+ scope.detach = shared.then(() => () => off(), () => () => { }); // a failed connect leaves nothing to detach, and no rejection unhandled
87
+ scope.client = shared;
88
+ }
89
+ return lease(scope, await scope.client);
90
+ }
91
+ catch (e) {
92
+ scope.client = undefined;
93
+ scope.busy = false;
94
+ throw e;
95
+ }
96
+ },
97
+ async run(fn) {
98
+ const scope = { open: true, busy: false };
99
+ try {
100
+ return await als.run(scope, fn);
101
+ }
102
+ finally {
103
+ scope.open = false;
104
+ // not awaited: ending a client waits for the server to close the socket, which the response need not wait for
105
+ if (!scope.busy)
106
+ release(scope, true);
107
+ }
108
+ },
109
+ };
110
+ }
111
+ //# sourceMappingURL=session.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/postgres/session.ts"],"names":[],"mappings":"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"}
@@ -10,10 +10,23 @@ export interface StorageReport {
10
10
  readonly blocked: readonly StorageChange[];
11
11
  readonly undeclared: readonly StorageChange[];
12
12
  }
13
+ /** The SQLSTATE `_mantle_expect` raises; the executor reads it as CONFLICT. */
14
+ export declare const EXPECT_STATE = "MX409";
13
15
  /** Constraint name -> "<schema>: <expression>", for the executor's CHECK message. */
14
16
  export declare function checkMessages(plan: Readonly<Record<string, StorageSchema>>): Map<string, string>;
15
- /** Converge storage to the plan. Blocked differences are reported and applied to nothing; a matching fingerprint reads nothing else. */
17
+ /**
18
+ * Converge storage to the plan. Blocked differences are reported and applied to nothing; a matching fingerprint reads nothing else.
19
+ *
20
+ * Every isolate of a deploy boots at once, so the work is one transaction under the advisory lock, in READ COMMITTED: a waiter
21
+ * wakes to a fresh snapshot, reads the fingerprint again, and finds the winner's work done (a SERIALIZABLE snapshot would predate
22
+ * it). The DDL runs under `lock_timeout`: ALTER TABLE queues for ACCESS EXCLUSIVE and every read after it queues behind it, so
23
+ * it gives up after `lockTimeoutMs`, rolls back, and tries again, rather than stalling live traffic behind a long query.
24
+ */
16
25
  export declare function convergeStorage(connect: PgConnect, plan: Readonly<Record<string, StorageSchema>>, options: {
17
26
  fingerprint: string;
27
+ booted?: string | null;
28
+ lockTimeoutMs?: number;
29
+ attempts?: number;
30
+ cooldownMs?: number;
18
31
  }): Promise<StorageReport>;
19
32
  //# sourceMappingURL=storage.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/postgres/storage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAsB,KAAK,SAAS,EAAoB,MAAM,aAAa,CAAC;AAInF,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,wBAAwB,GAAG,yBAAyB,GAAG,2BAA2B,GAAG,0BAA0B,CAAC;IAC/H,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AACD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAC3C,QAAQ,CAAC,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;CAC/C;AAsED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAEhG;AAwFD,wIAAwI;AACxI,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CA0BjK"}
1
+ {"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/postgres/storage.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAkC,KAAK,SAAS,EAAoB,MAAM,aAAa,CAAC;AAI/F,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,wBAAwB,GAAG,yBAAyB,GAAG,2BAA2B,GAAG,0BAA0B,CAAC;IAC/H,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AACD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,SAAS,aAAa,EAAE,CAAC;IAC3C,QAAQ,CAAC,UAAU,EAAE,SAAS,aAAa,EAAE,CAAC;CAC/C;AAQD,+EAA+E;AAC/E,eAAO,MAAM,YAAY,UAAU,CAAC;AA4DpC,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAEhG;AAgID;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CA+BzP"}
@@ -5,7 +5,7 @@
5
5
  * leaves rows that predate it alone, as D1's trigger does.
6
6
  */
7
7
  import { checkShapeProblem, storageColumns } from "../spec/domain/index.js";
8
- import { query, transaction } from "./driver.js";
8
+ import { query, sqlState } from "./driver.js";
9
9
  import { pgType } from "./codec.js";
10
10
  import { print, typed } from "./print.js";
11
11
  const q = (id) => `"${id.replace(/"/g, '""')}"`;
@@ -13,30 +13,25 @@ const q = (id) => `"${id.replace(/"/g, '""')}"`;
13
13
  const ident = (n) => (new TextEncoder().encode(n).length <= 63 ? n : `${n.slice(0, 50)}_${fnv(n)}`);
14
14
  /** FNV-1a, 32 bits, as hex: a stable suffix that needs no crypto module. */
15
15
  const fnv = (s) => [...s].reduce((h, c) => Math.imul(h ^ c.codePointAt(0), 16777619) >>> 0, 2166136261).toString(16).padStart(8, "0");
16
- /** Mantle's functions the lowering calls. Each is plain SQL, so the planner inlines it. */
16
+ /** The SQLSTATE `_mantle_expect` raises; the executor reads it as CONFLICT. */
17
+ export const EXPECT_STATE = "MX409";
18
+ /**
19
+ * Mantle's one function. ADR-0039 removed the SQLite emulations that used to sit beside it (`_mantle_jget`, `_mantle_bool`,
20
+ * `_mantle_json_each`); a database booted before keeps them, unreferenced and harmless, and no DROP is issued: an older release
21
+ * still running during a rolling deploy calls them, and a dropped function would fail its queries.
22
+ */
17
23
  const FUNCTIONS = [
18
- // x ->> k as SQLite reads it: a key, an index or a `$` path, over jsonb, json or JSON text
19
- // a `$` path is read strict and silent, as SQLite reads it: `$.a` of an array is NULL, not the array's members' `a`
20
- `CREATE OR REPLACE FUNCTION _mantle_jget(j jsonb, k text) RETURNS text LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$SELECT CASE WHEN left(k, 1) = '$' THEN jsonb_path_query_first(j, ('strict ' || k)::jsonpath, '{}', true) #>> '{}' ELSE j ->> k END$f$`,
21
- `CREATE OR REPLACE FUNCTION _mantle_jget(j jsonb, k int8) RETURNS text LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$SELECT j ->> k::int4$f$`,
22
- ...["text", "json"].flatMap((t) => ["text", "int8"].map((k) => `CREATE OR REPLACE FUNCTION _mantle_jget(j ${t}, k ${k}) RETURNS text LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$SELECT _mantle_jget(j::jsonb, k)$f$`)),
23
- // CAST(x AS bool) by PostgreSQL's own rules for every type the subset has (PostgreSQL itself has no bigint -> bool cast)
24
- `CREATE OR REPLACE FUNCTION _mantle_bool(x bool) RETURNS bool LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$SELECT x$f$`,
25
- `CREATE OR REPLACE FUNCTION _mantle_bool(x text) RETURNS bool LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$SELECT x::bool$f$`,
26
- ...["int4", "int8", "float8", "numeric"].map((t) => `CREATE OR REPLACE FUNCTION _mantle_bool(x ${t}) RETURNS bool LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$SELECT x <> 0$f$`),
27
- // json_each with SQLite's columns: a scalar's value is its SQL text, an object's or array's its JSON text; id orders the elements
28
- `CREATE OR REPLACE FUNCTION _mantle_json_each(j jsonb) RETURNS TABLE (key text, value text, type text, atom text, id int8) LANGUAGE sql IMMUTABLE PARALLEL SAFE AS $f$
29
- SELECT e.k,
30
- CASE WHEN jsonb_typeof(e.v) IN ('object', 'array') THEN e.v::text ELSE e.v #>> '{}' END,
31
- CASE jsonb_typeof(e.v) WHEN 'string' THEN 'text' WHEN 'boolean' THEN e.v::text WHEN 'number' THEN CASE WHEN e.v::text ~ '^-?[0-9]+$' THEN 'integer' ELSE 'real' END ELSE jsonb_typeof(e.v) END,
32
- CASE WHEN jsonb_typeof(e.v) IN ('object', 'array') THEN NULL ELSE e.v #>> '{}' END,
33
- e.n
34
- FROM (SELECT (a.n - 1)::text AS k, a.v, a.n FROM jsonb_array_elements(CASE WHEN jsonb_typeof(j) = 'array' THEN j ELSE '[]' END) WITH ORDINALITY a(v, n)
35
- UNION ALL SELECT o.k, o.v, o.n FROM jsonb_each(CASE WHEN jsonb_typeof(j) = 'object' THEN j ELSE '{}' END) WITH ORDINALITY o(k, v, n)) e$f$`,
24
+ // a write's `expect`, checked where it ran: a different count fails the statement, and with it the transaction
25
+ `CREATE OR REPLACE FUNCTION _mantle_expect(actual int8, expected int8) RETURNS bool LANGUAGE plpgsql VOLATILE AS $f$BEGIN
26
+ IF actual <> expected THEN RAISE EXCEPTION USING ERRCODE = '${EXPECT_STATE}', MESSAGE = format('the write matched %s rows, not %s', actual, expected); END IF;
27
+ RETURN true;
28
+ END$f$`,
36
29
  ];
37
30
  const SYSTEM_DDL = [
38
31
  "CREATE TABLE IF NOT EXISTS _mantle_boot_state (key text PRIMARY KEY, value text NOT NULL)",
39
32
  "CREATE TABLE IF NOT EXISTS _mantle_schema_tables (name text PRIMARY KEY)",
33
+ // the target an `expect` guard inserts into; its HAVING never lets a row through (executor.ts)
34
+ "CREATE TABLE IF NOT EXISTS _mantle_assert (ok boolean)",
40
35
  ];
41
36
  /** One convergence at a time per database: the others wait, then find the work done. */
42
37
  const LOCK = { text: "SELECT pg_advisory_xact_lock(4471522036519061)::text AS locked" };
@@ -57,6 +52,9 @@ function indexes(name, s) {
57
52
  return [
58
53
  ...(s.unique ?? []).map((u, i) => ({ name: `_mantle_uq_${name}_${i}`, unique: true, columns: s.scope && u[0] !== s.scope ? [s.scope, ...u] : [...u] })),
59
54
  ...(s.indexes ?? []).map((cols, i) => ({ name: `_mantle_ix_${name}_${i}`, unique: false, columns: [...cols] })),
55
+ // Admin's default list order (updated_at descending, then the id tiebreak), served by a backward scan (ADR-0039 decision 2)
56
+ // ponytail: every Schema pays this index on UPDATE; a write-hot table that is never listed could opt out once one is measured; a large existing table is better served by CREATE INDEX CONCURRENTLY (outside the convergence transaction) with the same name and columns, which is the upgrade path
57
+ { name: `_mantle_ix_${name}_updated`, unique: false, columns: [...(s.scope ? [s.scope] : []), "updated_at", "id"] },
60
58
  ].map((i) => ({ ...i, name: ident(i.name), sql: `CREATE ${i.unique ? "UNIQUE " : ""}INDEX IF NOT EXISTS ${q(ident(i.name))} ON ${q(name)} (${i.columns.map(q).join(", ")})` }));
61
59
  }
62
60
  /** A check's expression as PostgreSQL prints it, over the row's own columns. */
@@ -70,7 +68,13 @@ function checkText(expr, s) {
70
68
  export function checkMessages(plan) {
71
69
  return new Map(Object.entries(plan).flatMap(([name, s]) => (s.checks ?? []).map((c, i) => [ident(`_mantle_chk_${name}_${i}`), `${name}: ${checkText(c, s)}`])));
72
70
  }
73
- /** Text compares and sorts by code point, as on D1, whatever collation the database was created with. */
71
+ /**
72
+ * Text compares and sorts by code point, whatever collation the database was created with.
73
+ * ponytail: this began as D1 emulation (ADR-0039 keeps the tiebreak in the column's own collation, so indexes still serve it). Dropping it
74
+ * only changes tables created from now on and leaves the earlier ones in "C", so one Schema family would sort text two ways by age
75
+ * (and a database whose collation is en_US sorts ids and names by locale); the upgrade is a deliberate rebuild of text columns and
76
+ * their indexes in one release, which needs the migration this PR avoids. Tracked as a follow-up issue.
77
+ */
74
78
  const ddlType = (type) => (type === "text" ? 'text COLLATE "C"' : type);
75
79
  const createTable = (name, s) => `CREATE TABLE ${q(name)} (${[
76
80
  "_rid bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY", `id ${ddlType("text")} NOT NULL UNIQUE`, "version int8 NOT NULL DEFAULT 1",
@@ -80,20 +84,29 @@ const createTable = (name, s) => `CREATE TABLE ${q(name)} (${[
80
84
  const tooLong = (n) => new TextEncoder().encode(n).length > 63;
81
85
  /** `information_schema`'s spelling of a column type, to compare with the plan's. */
82
86
  const spelled = (r) => r.udt_name === "numeric" && r.numeric_precision !== null ? `numeric(${r.numeric_precision}, ${r.numeric_scale})` : r.udt_name;
83
- async function diff(connect, plan) {
87
+ /** One at a time: node-postgres deprecates a query issued while another is in flight (`Promise.all`), and pipelining is the driver's own business. */
88
+ async function sequentially(items, f) {
89
+ const out = [];
90
+ for (const i of items)
91
+ out.push(await f(i));
92
+ return out;
93
+ }
94
+ /** The catalog reads and the plan's differences, over the client that holds the convergence lock. */
95
+ async function diff(client, plan) {
84
96
  const statements = [];
85
97
  const blocked = [];
86
98
  const undeclared = [];
87
99
  const block = (schema, message, code = "STORAGE_CHANGE_BLOCKED") => blocked.push({ schema, code, message });
88
- const [tables, owned, cols, idx, chk] = (await transaction(connect, [
89
- { text: "SELECT table_name AS name FROM information_schema.tables WHERE table_schema = current_schema()" },
90
- { text: "SELECT name FROM _mantle_schema_tables" },
91
- { text: "SELECT table_name, column_name, udt_name, numeric_precision, numeric_scale FROM information_schema.columns WHERE table_schema = current_schema()" },
92
- { text: `SELECT t.relname AS tbl, i.relname AS name, ix.indisunique AS uniq, ix.indisprimary AS pk, ix.indpred IS NOT NULL AS partial,
100
+ const [tables, owned, cols, idx, chk] = (await sequentially([
101
+ "SELECT table_name AS name FROM information_schema.tables WHERE table_schema = current_schema()",
102
+ "SELECT name FROM _mantle_schema_tables",
103
+ "SELECT table_name, column_name, udt_name, numeric_precision, numeric_scale FROM information_schema.columns WHERE table_schema = current_schema()",
104
+ `SELECT t.relname AS tbl, i.relname AS name, ix.indisunique AS uniq, ix.indisprimary AS pk, ix.indpred IS NOT NULL AS partial,
93
105
  (SELECT string_agg(a.attname, ',' ORDER BY k.ord) FROM unnest(ix.indkey) WITH ORDINALITY k(attnum, ord) JOIN pg_attribute a ON a.attrelid = ix.indrelid AND a.attnum = k.attnum) AS cols
94
- FROM pg_index ix JOIN pg_class i ON i.oid = ix.indexrelid JOIN pg_class t ON t.oid = ix.indrelid WHERE t.relnamespace = current_schema()::regnamespace` },
95
- { text: "SELECT t.relname AS tbl, c.conname AS name FROM pg_constraint c JOIN pg_class t ON t.oid = c.conrelid WHERE c.contype = 'c' AND t.relnamespace = current_schema()::regnamespace" },
96
- ])).map((o) => o.rows);
106
+ FROM pg_index ix JOIN pg_class i ON i.oid = ix.indexrelid JOIN pg_class t ON t.oid = ix.indrelid WHERE t.relnamespace = current_schema()::regnamespace`,
107
+ // the comment is the expression Mantle added the check from (CHECK_MARK): PostgreSQL prints a constraint in its own normal form, which is not the plan's
108
+ "SELECT t.relname AS tbl, c.conname AS name, obj_description(c.oid, 'pg_constraint') AS comment FROM pg_constraint c JOIN pg_class t ON t.oid = c.conrelid WHERE c.contype = 'c' AND t.relnamespace = current_schema()::regnamespace",
109
+ ], (text) => client.query({ text }))).map((o) => o.rows);
97
110
  const existing = new Set(tables.map((r) => String(r.name)));
98
111
  const ownedNames = new Set(owned.map((r) => String(r.name)));
99
112
  for (const [name, schema] of Object.entries(plan)) {
@@ -158,44 +171,113 @@ async function diff(connect, plan) {
158
171
  undeclared.push({ schema: name, code: "STORAGE_UNDECLARED_INDEX", message: schema.scope && n === ident(`_mantle_scope_${name}`) ? `index ${n} is redundant: a declared index leads with ${schema.scope}; drop it by hand` : `index ${n} is in the database and not in the plan; it is kept` });
159
172
  }
160
173
  }
161
- // Mantle's checks are rebuilt from the plan: dropped, then added NOT VALID (a check binds writes, not old rows)
162
- for (const r of chk)
163
- if (r.tbl === name && String(r.name).startsWith("_mantle_chk_"))
174
+ // Mantle's checks follow the plan: one whose expression is unchanged is left alone (a DROP and ADD takes ACCESS EXCLUSIVE on a
175
+ // table live traffic reads), the rest are dropped and added NOT VALID (a check binds writes, not old rows)
176
+ // ponytail: checks are named by position, so inserting one mid-list rebuilds the later ones; naming by expression hash avoids it
177
+ const wantChecks = new Map((schema.checks ?? []).map((c, i) => [ident(`_mantle_chk_${name}_${i}`), checkText(c, schema)]));
178
+ const kept = new Set();
179
+ for (const r of chk) {
180
+ if (r.tbl !== name || !String(r.name).startsWith("_mantle_chk_"))
181
+ continue;
182
+ const text = wantChecks.get(String(r.name));
183
+ if (text !== undefined && r.comment === CHECK_MARK + text)
184
+ kept.add(String(r.name));
185
+ else
164
186
  statements.push({ text: `ALTER TABLE ${t} DROP CONSTRAINT IF EXISTS ${q(String(r.name))}` });
165
- (schema.checks ?? []).forEach((c, i) => statements.push({ text: `ALTER TABLE ${t} ADD CONSTRAINT ${q(ident(`_mantle_chk_${name}_${i}`))} CHECK (${checkText(c, schema)}) NOT VALID` }));
187
+ }
188
+ for (const [n, text] of wantChecks) {
189
+ if (kept.has(n))
190
+ continue;
191
+ statements.push({ text: `ALTER TABLE ${t} ADD CONSTRAINT ${q(n)} CHECK (${text}) NOT VALID` }, { text: `COMMENT ON CONSTRAINT ${q(n)} ON ${t} IS '${(CHECK_MARK + text).replace(/'/g, "''")}'` });
192
+ }
166
193
  }
167
194
  return { statements, blocked, undeclared };
168
195
  }
169
- /** Converge storage to the plan. Blocked differences are reported and applied to nothing; a matching fingerprint reads nothing else. */
196
+ /** Bump whenever `indexes()` or `createTable()` output changes for an unchanged plan: the boot state includes it, so a booted database converges again. */
197
+ const LAYOUT = "2";
198
+ /** Prefixes the comment on a Mantle check: the expression it was added from, so the next boot can tell whether the plan changed it. */
199
+ const CHECK_MARK = "mantle:";
200
+ /** How long a boot that gave up on a lock fails fast. ponytail: per process and per `connect`; a shared record (a _mantle_boot_state row) would also quiet other isolates. */
201
+ const COOL_DOWN_MS = 10_000;
202
+ const COOL_DOWN = new WeakMap();
203
+ const BOOTED = "SELECT value FROM _mantle_boot_state WHERE key = 'fingerprint'";
204
+ /**
205
+ * Converge storage to the plan. Blocked differences are reported and applied to nothing; a matching fingerprint reads nothing else.
206
+ *
207
+ * Every isolate of a deploy boots at once, so the work is one transaction under the advisory lock, in READ COMMITTED: a waiter
208
+ * wakes to a fresh snapshot, reads the fingerprint again, and finds the winner's work done (a SERIALIZABLE snapshot would predate
209
+ * it). The DDL runs under `lock_timeout`: ALTER TABLE queues for ACCESS EXCLUSIVE and every read after it queues behind it, so
210
+ * it gives up after `lockTimeoutMs`, rolls back, and tries again, rather than stalling live traffic behind a long query.
211
+ */
170
212
  export async function convergeStorage(connect, plan, options) {
171
213
  // the plan and Mantle's functions: a release that changes a function re-creates it on the next boot
172
- const state = `${options.fingerprint}|${fnv(FUNCTIONS.join("\n"))}`;
173
- const booted = await query(connect, { text: "SELECT value FROM _mantle_boot_state WHERE key = 'fingerprint'" }).catch(() => undefined);
174
- if (booted?.rows[0]?.value === state)
214
+ const state = `${options.fingerprint}|${fnv(FUNCTIONS.join("\n"))}|${LAYOUT}`;
215
+ const booted = options.booted !== undefined ? options.booted : (await query(connect, { text: BOOTED }).catch(() => undefined))?.rows[0]?.value;
216
+ if (booted === state)
175
217
  return { skipped: true, blocked: [], undeclared: [] };
176
- await transaction(connect, [LOCK, ...SYSTEM_DDL.map((text) => ({ text })), ...FUNCTIONS.map((text) => ({ text })),
177
- { text: "INSERT INTO _mantle_boot_state (key, value) VALUES ('instance', $1) ON CONFLICT DO NOTHING", values: [crypto.randomUUID()] }], undefined, 0);
178
- for (let attempt = 0;; attempt++) {
179
- const { statements, blocked, undeclared } = await diff(connect, plan);
180
- if (blocked.length)
181
- return { skipped: false, blocked, undeclared };
182
- statements.push({ text: "INSERT INTO _mantle_boot_state (key, value) VALUES ('fingerprint', $1) ON CONFLICT (key) DO UPDATE SET value = excluded.value", values: [state] });
218
+ // a boot that gave up on a lock is not retried by every request of every isolate: for `cooldownMs` it fails fast with the same report
219
+ const cool = COOL_DOWN.get(connect);
220
+ if (cool && cool.state === state && cool.until > Date.now())
221
+ return cool.report;
222
+ const lockTimeout = Math.max(1, Math.floor(options.lockTimeoutMs ?? 1000));
223
+ const attempts = options.attempts ?? 5;
224
+ for (let attempt = 1;; attempt++) {
225
+ const client = await connect();
183
226
  try {
184
- // convergence builds indexes on tables that may be large: no statement timeout
185
- await transaction(connect, [LOCK, ...statements], undefined, 0);
186
- return { skipped: false, blocked: [], undeclared };
227
+ return await locked(client, plan, state, lockTimeout);
187
228
  }
188
229
  catch (e) {
189
- const state = e.code;
190
- // another isolate converged while this one diffed: diff again against what it left
191
- if ((state === "42P07" || state === "42701" || state === "42710") && attempt < 2)
192
- continue;
193
- if (state === "23505") {
230
+ await client.query({ text: "ROLLBACK" }).catch(() => undefined);
231
+ const code = sqlState(e);
232
+ if (code === "55P03") {
233
+ if (attempt < attempts) {
234
+ await new Promise((r) => setTimeout(r, Math.random() * 100 * attempt));
235
+ continue;
236
+ }
237
+ const why = e instanceof Error ? e.message : String(e);
238
+ const report = { skipped: false, undeclared: [], blocked: [{ schema: "*", code: "STORAGE_CHANGE_BLOCKED", message: `storage could not be converged: a lock stayed held for ${attempts} tries of ${lockTimeout} ms (${why}); ${e.advisoryLock ? "another boot is still converging this database; boot again once it finishes" : "a long transaction or query is using a table the plan changes; end it, or boot again when traffic is lower"}. Nothing was applied (not retried for ${(options.cooldownMs ?? COOL_DOWN_MS) / 1000} s)` }] };
239
+ COOL_DOWN.set(connect, { state, until: Date.now() + (options.cooldownMs ?? COOL_DOWN_MS), report });
240
+ return report;
241
+ }
242
+ if (code === "23505") {
194
243
  const msg = e instanceof Error ? e.message : String(e);
195
- return { skipped: false, blocked: [{ schema: "*", code: "STORAGE_CHANGE_BLOCKED", message: `a unique index cannot be created: existing rows break it (${msg}); dedupe the data, then rerun` }], undeclared };
244
+ return { skipped: false, undeclared: [], blocked: [{ schema: "*", code: "STORAGE_CHANGE_BLOCKED", message: `a unique index cannot be created: existing rows break it (${msg}); dedupe the data, then rerun` }] };
196
245
  }
197
246
  throw e;
198
247
  }
248
+ finally {
249
+ await client.end().catch(() => undefined);
250
+ }
251
+ }
252
+ }
253
+ async function locked(client, plan, state, lockTimeoutMs) {
254
+ const run = (s) => client.query({ text: s.text, ...(s.values ? { values: [...s.values] } : {}) });
255
+ // convergence builds indexes on tables that may be large: no statement timeout. The lock wait below has none either: a waiter is behind the winner's work
256
+ // lock_timeout comes first so the advisory wait is bounded too: a herd gives up together, not one isolate after another
257
+ // ponytail: a winner building a large index outlasts that bound and the waiters report a blocked boot; a longer advisory wait than DDL wait is the upgrade once it is measured
258
+ await client.query({ text: `BEGIN ISOLATION LEVEL READ COMMITTED; SET LOCAL statement_timeout = 0; SET LOCAL lock_timeout = ${lockTimeoutMs}` });
259
+ // a lock timeout here is the advisory lock (another boot converging); the caller words its diagnostic by it
260
+ await run(LOCK).catch((e) => { if (sqlState(e) === "55P03")
261
+ Object.assign(e, { advisoryLock: true }); throw e; });
262
+ for (const text of SYSTEM_DDL)
263
+ await run({ text });
264
+ // another isolate may have converged while this one waited for the lock: this read, after it, sees its commit
265
+ if ((await run({ text: BOOTED })).rows[0]?.value === state) {
266
+ await client.query({ text: "COMMIT" });
267
+ return { skipped: true, blocked: [], undeclared: [] };
268
+ }
269
+ for (const text of FUNCTIONS)
270
+ await run({ text });
271
+ await run({ text: "INSERT INTO _mantle_boot_state (key, value) VALUES ('instance', $1) ON CONFLICT DO NOTHING", values: [crypto.randomUUID()] });
272
+ const { statements, blocked, undeclared } = await diff(client, plan);
273
+ if (blocked.length) {
274
+ await client.query({ text: "COMMIT" });
275
+ return { skipped: false, blocked, undeclared };
199
276
  }
277
+ for (const s of statements)
278
+ await run(s);
279
+ await run({ text: "INSERT INTO _mantle_boot_state (key, value) VALUES ('fingerprint', $1) ON CONFLICT (key) DO UPDATE SET value = excluded.value", values: [state] });
280
+ await client.query({ text: "COMMIT" });
281
+ return { skipped: false, blocked: [], undeclared };
200
282
  }
201
283
  //# sourceMappingURL=storage.js.map