pipework 0.17.1 → 0.18.0
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/CHANGELOG.md +10 -0
- package/dist/REFERENCE.md +1190 -0
- package/dist/data/migrate/apply.d.ts +5 -7
- package/dist/data/migrate/apply.d.ts.map +1 -1
- package/dist/data/migrate/apply.js +7 -95
- package/dist/data/migrate/apply.js.map +1 -1
- package/dist/data/migrate/post-process.d.ts.map +1 -1
- package/dist/data/migrate/post-process.js +15 -5
- package/dist/data/migrate/post-process.js.map +1 -1
- package/dist/data/migrate/safety.d.ts.map +1 -1
- package/dist/data/migrate/safety.js +12 -7
- package/dist/data/migrate/safety.js.map +1 -1
- package/dist/data/migrate/statements.d.ts +50 -0
- package/dist/data/migrate/statements.d.ts.map +1 -0
- package/dist/data/migrate/statements.js +225 -0
- package/dist/data/migrate/statements.js.map +1 -0
- package/package.json +1 -1
|
@@ -20,14 +20,12 @@ export interface Migration {
|
|
|
20
20
|
export declare function applyMigrations(options: ApplyOptions): Promise<number>;
|
|
21
21
|
export declare function readMigrations(options: ApplyOptions): Migration[];
|
|
22
22
|
/**
|
|
23
|
-
* Split migration SQL into individual statements
|
|
24
|
-
*
|
|
25
|
-
* stripped; `--> statement-breakpoint` is honored as an explicit separator.
|
|
23
|
+
* Split migration SQL into individual statements, honoring drizzle's
|
|
24
|
+
* `--> statement-breakpoint` as an explicit separator.
|
|
26
25
|
*
|
|
27
|
-
* The
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
* definition into unrunnable fragments. Issue #317.
|
|
26
|
+
* The scanning rules live in `statements.ts`, shared with the safety gate so
|
|
27
|
+
* the runner and the gate cannot disagree about where a statement begins —
|
|
28
|
+
* they did, and the gate was the one that was wrong (#334).
|
|
31
29
|
*/
|
|
32
30
|
export declare function parseStatements(raw: string): string[];
|
|
33
31
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/apply.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,YAAY;IAC3B,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AASD,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA2F5E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,EAAE,CA4CjE;AAED
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/apply.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,YAAY;IAC3B,gBAAgB,EAAE,MAAM,CAAA;IACxB,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AASD,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,aAAa,EAAE,OAAO,CAAA;CACvB;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CA2F5E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,SAAS,EAAE,CA4CjE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAErD;AAMD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { readFileSync, existsSync } from 'node:fs';
|
|
2
2
|
import { createHash } from 'node:crypto';
|
|
3
3
|
import postgres from 'postgres';
|
|
4
|
+
import { scanStatements } from './statements.js';
|
|
4
5
|
const NO_TRANSACTION_PRAGMA = '-- pipework:no-transaction';
|
|
5
|
-
const STATEMENT_BREAKPOINT = '--> statement-breakpoint';
|
|
6
6
|
export async function applyMigrations(options) {
|
|
7
7
|
const migrations = readMigrations(options);
|
|
8
8
|
if (migrations.length === 0)
|
|
@@ -107,103 +107,15 @@ export function readMigrations(options) {
|
|
|
107
107
|
return migrations;
|
|
108
108
|
}
|
|
109
109
|
/**
|
|
110
|
-
* Split migration SQL into individual statements
|
|
111
|
-
*
|
|
112
|
-
* stripped; `--> statement-breakpoint` is honored as an explicit separator.
|
|
110
|
+
* Split migration SQL into individual statements, honoring drizzle's
|
|
111
|
+
* `--> statement-breakpoint` as an explicit separator.
|
|
113
112
|
*
|
|
114
|
-
* The
|
|
115
|
-
*
|
|
116
|
-
*
|
|
117
|
-
* definition into unrunnable fragments. Issue #317.
|
|
113
|
+
* The scanning rules live in `statements.ts`, shared with the safety gate so
|
|
114
|
+
* the runner and the gate cannot disagree about where a statement begins —
|
|
115
|
+
* they did, and the gate was the one that was wrong (#334).
|
|
118
116
|
*/
|
|
119
117
|
export function parseStatements(raw) {
|
|
120
|
-
|
|
121
|
-
let current = '';
|
|
122
|
-
const flush = () => {
|
|
123
|
-
if (current.trim().length > 0)
|
|
124
|
-
statements.push(current.trim());
|
|
125
|
-
current = '';
|
|
126
|
-
};
|
|
127
|
-
let i = 0;
|
|
128
|
-
while (i < raw.length) {
|
|
129
|
-
const ch = raw[i];
|
|
130
|
-
// `--` line comment: stripped to end of line. `--> statement-breakpoint` is
|
|
131
|
-
// the one comment that also terminates the current statement.
|
|
132
|
-
if (ch === '-' && raw[i + 1] === '-') {
|
|
133
|
-
const nl = raw.indexOf('\n', i);
|
|
134
|
-
const end = nl === -1 ? raw.length : nl;
|
|
135
|
-
if (raw.slice(i, end).trim() === STATEMENT_BREAKPOINT)
|
|
136
|
-
flush();
|
|
137
|
-
i = end;
|
|
138
|
-
continue;
|
|
139
|
-
}
|
|
140
|
-
// `'...'` literal — `''` is an escaped quote. Copied verbatim.
|
|
141
|
-
if (ch === "'") {
|
|
142
|
-
const end = scanSingleQuote(raw, i);
|
|
143
|
-
current += raw.slice(i, end);
|
|
144
|
-
i = end;
|
|
145
|
-
continue;
|
|
146
|
-
}
|
|
147
|
-
// `$tag$ ... $tag$` dollar-quoted block. Copied verbatim — inner `;`/`--`
|
|
148
|
-
// are body content, not separators.
|
|
149
|
-
if (ch === '$') {
|
|
150
|
-
const tag = dollarQuoteTag(raw, i);
|
|
151
|
-
if (tag !== null) {
|
|
152
|
-
const close = raw.indexOf(tag, i + tag.length);
|
|
153
|
-
const end = close === -1 ? raw.length : close + tag.length;
|
|
154
|
-
current += raw.slice(i, end);
|
|
155
|
-
i = end;
|
|
156
|
-
continue;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
if (ch === ';') {
|
|
160
|
-
flush();
|
|
161
|
-
i += 1;
|
|
162
|
-
continue;
|
|
163
|
-
}
|
|
164
|
-
current += ch;
|
|
165
|
-
i += 1;
|
|
166
|
-
}
|
|
167
|
-
flush();
|
|
168
|
-
return statements;
|
|
169
|
-
}
|
|
170
|
-
/**
|
|
171
|
-
* `start` indexes the opening `'`. Returns the index just past the closing `'`,
|
|
172
|
-
* treating a doubled `''` as an escaped quote. An unterminated literal returns
|
|
173
|
-
* the end of input — the statement is emitted as-is so Postgres reports it.
|
|
174
|
-
*/
|
|
175
|
-
function scanSingleQuote(raw, start) {
|
|
176
|
-
let i = start + 1;
|
|
177
|
-
while (i < raw.length) {
|
|
178
|
-
if (raw[i] === "'") {
|
|
179
|
-
if (raw[i + 1] === "'") {
|
|
180
|
-
i += 2;
|
|
181
|
-
continue;
|
|
182
|
-
}
|
|
183
|
-
return i + 1;
|
|
184
|
-
}
|
|
185
|
-
i += 1;
|
|
186
|
-
}
|
|
187
|
-
return raw.length;
|
|
188
|
-
}
|
|
189
|
-
/**
|
|
190
|
-
* If `start` indexes the opening `$` of a dollar-quote tag (`$$` or `$label$`,
|
|
191
|
-
* where a label is a SQL identifier), returns the full tag text; otherwise
|
|
192
|
-
* `null`. A `$` followed by a digit (`$1`) or non-identifier character is not
|
|
193
|
-
* a tag.
|
|
194
|
-
*/
|
|
195
|
-
function dollarQuoteTag(raw, start) {
|
|
196
|
-
let i = start + 1;
|
|
197
|
-
while (i < raw.length) {
|
|
198
|
-
const c = raw[i];
|
|
199
|
-
if (c === '$')
|
|
200
|
-
return raw.slice(start, i + 1);
|
|
201
|
-
const valid = i === start + 1 ? /[A-Za-z_]/.test(c) : /[A-Za-z0-9_]/.test(c);
|
|
202
|
-
if (!valid)
|
|
203
|
-
return null;
|
|
204
|
-
i += 1;
|
|
205
|
-
}
|
|
206
|
-
return null;
|
|
118
|
+
return scanStatements(raw, { breakpointSeparator: true });
|
|
207
119
|
}
|
|
208
120
|
function quoteIdent(name) {
|
|
209
121
|
return `"${name.replace(/"/g, '""')}"`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/data/migrate/apply.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,QAAQ,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/data/migrate/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-process.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/post-process.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"post-process.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/post-process.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAoDxD"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { stripComments, codeStartOffset } from './statements.js';
|
|
1
2
|
const CREATE_INDEX_RE = /\bCREATE\s+(UNIQUE\s+)?INDEX\b(?!\s+CONCURRENTLY)/i;
|
|
2
3
|
const CONCURRENTLY_RE = /\bCONCURRENTLY\b/i;
|
|
3
4
|
const NO_TRANSACTION_PRAGMA = '-- pipework:no-transaction';
|
|
@@ -21,18 +22,27 @@ export function postProcessMigration(sql) {
|
|
|
21
22
|
const outputStatements = [];
|
|
22
23
|
let hasConcurrently = false;
|
|
23
24
|
for (const raw of rawStatements) {
|
|
24
|
-
|
|
25
|
-
|
|
25
|
+
// Match against the SQL with comments removed, not against the raw
|
|
26
|
+
// fragment. A statement and the comment above it share a `;`-fragment, so
|
|
27
|
+
// skipping fragments that *start with* `--` skipped the statement too and
|
|
28
|
+
// a commented CREATE INDEX silently kept its exclusive lock (#334).
|
|
29
|
+
// Comment text is equally unable to fake a match it should not have.
|
|
30
|
+
const code = stripComments(raw);
|
|
31
|
+
if (code.trim().length === 0) {
|
|
26
32
|
outputStatements.push(raw);
|
|
27
33
|
continue;
|
|
28
34
|
}
|
|
29
|
-
if (CREATE_INDEX_RE.test(
|
|
30
|
-
|
|
35
|
+
if (CREATE_INDEX_RE.test(code)) {
|
|
36
|
+
// Rewrite only from where the SQL actually starts, so a leading comment
|
|
37
|
+
// that happens to say "CREATE INDEX" is not the thing rewritten.
|
|
38
|
+
const offset = codeStartOffset(raw);
|
|
39
|
+
const rewritten = raw.slice(0, offset) +
|
|
40
|
+
raw.slice(offset).replace(/\b(CREATE\s+(?:UNIQUE\s+)?)(INDEX)\b/i, '$1$2 CONCURRENTLY');
|
|
31
41
|
outputStatements.push(rewritten);
|
|
32
42
|
hasConcurrently = true;
|
|
33
43
|
continue;
|
|
34
44
|
}
|
|
35
|
-
if (CONCURRENTLY_RE.test(
|
|
45
|
+
if (CONCURRENTLY_RE.test(code)) {
|
|
36
46
|
hasConcurrently = true;
|
|
37
47
|
}
|
|
38
48
|
outputStatements.push(raw);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-process.js","sourceRoot":"","sources":["../../../src/data/migrate/post-process.ts"],"names":[],"mappings":"AAAA,MAAM,eAAe,GAAG,oDAAoD,CAAA;AAC5E,MAAM,eAAe,GAAG,mBAAmB,CAAA;AAE3C,MAAM,qBAAqB,GAAG,4BAA4B,CAAA;AAE1D;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACxC,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAExC,MAAM,gBAAgB,GAAa,EAAE,CAAA;IACrC,IAAI,eAAe,GAAG,KAAK,CAAA;IAE3B,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,
|
|
1
|
+
{"version":3,"file":"post-process.js","sourceRoot":"","sources":["../../../src/data/migrate/post-process.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEhE,MAAM,eAAe,GAAG,oDAAoD,CAAA;AAC5E,MAAM,eAAe,GAAG,mBAAmB,CAAA;AAE3C,MAAM,qBAAqB,GAAG,4BAA4B,CAAA;AAE1D;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACxC,MAAM,aAAa,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAExC,MAAM,gBAAgB,GAAa,EAAE,CAAA;IACrC,IAAI,eAAe,GAAG,KAAK,CAAA;IAE3B,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,mEAAmE;QACnE,0EAA0E;QAC1E,0EAA0E;QAC1E,oEAAoE;QACpE,qEAAqE;QACrE,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;QAC/B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAC1B,SAAQ;QACV,CAAC;QAED,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,wEAAwE;YACxE,iEAAiE;YACjE,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;YACnC,MAAM,SAAS,GACb,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;gBACpB,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,uCAAuC,EAAE,mBAAmB,CAAC,CAAA;YACzF,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAChC,eAAe,GAAG,IAAI,CAAA;YACtB,SAAQ;QACV,CAAC;QAED,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC/B,eAAe,GAAG,IAAI,CAAA;QACxB,CAAC;QAED,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5B,CAAC;IAED,IAAI,MAAM,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;IAE7C,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,QAAQ,CAAA;IACpB,CAAC;IAED,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC;YAC/C,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,GAAG,qBAAqB,KAAK,MAAM,EAAE,CAAA;IAC3C,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/safety.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"safety.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/safety.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,MAAM,CAAA;AAEzD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB;AAyFD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,eAAe,EAAE,CAmBzD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAoB9E"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { scanStatements } from './statements.js';
|
|
1
2
|
const RULES = [
|
|
2
3
|
// ── Destructive (data loss / backward-incompatible) ───────────────────
|
|
3
4
|
{
|
|
@@ -63,9 +64,19 @@ const RULES = [
|
|
|
63
64
|
operation: 'ADD FOREIGN KEY (without NOT VALID)',
|
|
64
65
|
suggestion: 'Add the constraint with NOT VALID, then VALIDATE CONSTRAINT in a separate statement.',
|
|
65
66
|
},
|
|
67
|
+
{
|
|
68
|
+
// Locking rather than destructive: on a non-empty table this fails loudly
|
|
69
|
+
// instead of losing data, so it aborts the deploy rather than silently
|
|
70
|
+
// damaging it. It is still a gate-worthy hazard, hence the rule (#334).
|
|
71
|
+
pattern: /\bADD\s+COLUMN\b[^;]*\bNOT\s+NULL\b/i,
|
|
72
|
+
severity: 'locking',
|
|
73
|
+
operation: 'ADD COLUMN NOT NULL (without DEFAULT)',
|
|
74
|
+
suggestion: 'Add the column nullable, backfill, then SET NOT NULL — or give it a DEFAULT so existing rows can be filled.',
|
|
75
|
+
except: /\bDEFAULT\b/i,
|
|
76
|
+
},
|
|
66
77
|
];
|
|
67
78
|
export function analyzeSQL(sql) {
|
|
68
|
-
const statements =
|
|
79
|
+
const statements = scanStatements(sql);
|
|
69
80
|
const hazards = [];
|
|
70
81
|
for (const stmt of statements) {
|
|
71
82
|
for (const rule of RULES) {
|
|
@@ -83,12 +94,6 @@ export function analyzeSQL(sql) {
|
|
|
83
94
|
}
|
|
84
95
|
return hazards;
|
|
85
96
|
}
|
|
86
|
-
function splitStatements(sql) {
|
|
87
|
-
return sql
|
|
88
|
-
.split(/;/)
|
|
89
|
-
.map(s => s.trim())
|
|
90
|
-
.filter(s => s.length > 0 && !s.startsWith('--'));
|
|
91
|
-
}
|
|
92
97
|
export function formatHazards(hazards, file) {
|
|
93
98
|
const destructive = hazards.filter(h => h.severity === 'destructive');
|
|
94
99
|
const locking = hazards.filter(h => h.severity === 'locking');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safety.js","sourceRoot":"","sources":["../../../src/data/migrate/safety.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"safety.js","sourceRoot":"","sources":["../../../src/data/migrate/safety.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One SQL scanner, shared by everything in the migrate pipeline that has to
|
|
3
|
+
* reason about statement boundaries.
|
|
4
|
+
*
|
|
5
|
+
* There were two hand-rolled splitters before this, and they disagreed. The
|
|
6
|
+
* runner (`parseStatements`) learned string literals and dollar-quoted bodies
|
|
7
|
+
* in #317 so a plpgsql function body would survive; the safety gate kept a
|
|
8
|
+
* `sql.split(';')` that then discarded any fragment starting with `--`. Since
|
|
9
|
+
* a statement and the comment above it land in the *same* fragment, the gate
|
|
10
|
+
* dropped comment-led statements entirely and reported migrations clean that
|
|
11
|
+
* dropped tables (#334). Neither splitter knew about block comments or quoted
|
|
12
|
+
* identifiers.
|
|
13
|
+
*
|
|
14
|
+
* The rules, in one place:
|
|
15
|
+
*
|
|
16
|
+
* - `--` runs to end of line; block comments nest, per Postgres.
|
|
17
|
+
* - Comments are removed, replaced by whitespace so they still separate tokens.
|
|
18
|
+
* - `'…'`, `"…"` and `$tag$…$tag$` are copied verbatim — a `;` or `--` inside
|
|
19
|
+
* them is content, not syntax. Backslash escapes apply only in `E'…'`.
|
|
20
|
+
* - Comment state and quote state are decided in the same pass. That ordering
|
|
21
|
+
* is load-bearing: an apostrophe in a comment (`-- the migration's ancestors`)
|
|
22
|
+
* must not open a string literal, and a `--` inside a literal must not open
|
|
23
|
+
* a comment. Either check running first, alone, gets the other case wrong.
|
|
24
|
+
* - An unterminated comment or literal runs to end of input; the SQL is invalid
|
|
25
|
+
* either way and Postgres is what should say so.
|
|
26
|
+
*/
|
|
27
|
+
export interface ScanOptions {
|
|
28
|
+
/**
|
|
29
|
+
* Honor drizzle's `--> statement-breakpoint` as an explicit statement
|
|
30
|
+
* separator. The runner needs this (it decides what is sent to Postgres as
|
|
31
|
+
* one statement); the safety gate does not care.
|
|
32
|
+
*/
|
|
33
|
+
breakpointSeparator?: boolean;
|
|
34
|
+
}
|
|
35
|
+
/** Splits SQL into statements, stripping comments. */
|
|
36
|
+
export declare function scanStatements(sql: string, options?: ScanOptions): string[];
|
|
37
|
+
/**
|
|
38
|
+
* Removes comments, leaving literals and dollar-quoted bodies intact and
|
|
39
|
+
* statement separators where they were. For callers that need to test SQL
|
|
40
|
+
* against a pattern without a comment supplying a false match or hiding a
|
|
41
|
+
* real one.
|
|
42
|
+
*/
|
|
43
|
+
export declare function stripComments(sql: string): string;
|
|
44
|
+
/**
|
|
45
|
+
* Index of the first character of actual SQL in `sql` — i.e. past any leading
|
|
46
|
+
* whitespace and comments. Lets a text rewriter skip a leading comment block
|
|
47
|
+
* without rewriting words inside it.
|
|
48
|
+
*/
|
|
49
|
+
export declare function codeStartOffset(sql: string): number;
|
|
50
|
+
//# sourceMappingURL=statements.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"statements.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/statements.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAMH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B;AAED,sDAAsD;AACtD,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,MAAM,EAAE,CAqE/E;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAmCjD;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAoBnD"}
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* One SQL scanner, shared by everything in the migrate pipeline that has to
|
|
3
|
+
* reason about statement boundaries.
|
|
4
|
+
*
|
|
5
|
+
* There were two hand-rolled splitters before this, and they disagreed. The
|
|
6
|
+
* runner (`parseStatements`) learned string literals and dollar-quoted bodies
|
|
7
|
+
* in #317 so a plpgsql function body would survive; the safety gate kept a
|
|
8
|
+
* `sql.split(';')` that then discarded any fragment starting with `--`. Since
|
|
9
|
+
* a statement and the comment above it land in the *same* fragment, the gate
|
|
10
|
+
* dropped comment-led statements entirely and reported migrations clean that
|
|
11
|
+
* dropped tables (#334). Neither splitter knew about block comments or quoted
|
|
12
|
+
* identifiers.
|
|
13
|
+
*
|
|
14
|
+
* The rules, in one place:
|
|
15
|
+
*
|
|
16
|
+
* - `--` runs to end of line; block comments nest, per Postgres.
|
|
17
|
+
* - Comments are removed, replaced by whitespace so they still separate tokens.
|
|
18
|
+
* - `'…'`, `"…"` and `$tag$…$tag$` are copied verbatim — a `;` or `--` inside
|
|
19
|
+
* them is content, not syntax. Backslash escapes apply only in `E'…'`.
|
|
20
|
+
* - Comment state and quote state are decided in the same pass. That ordering
|
|
21
|
+
* is load-bearing: an apostrophe in a comment (`-- the migration's ancestors`)
|
|
22
|
+
* must not open a string literal, and a `--` inside a literal must not open
|
|
23
|
+
* a comment. Either check running first, alone, gets the other case wrong.
|
|
24
|
+
* - An unterminated comment or literal runs to end of input; the SQL is invalid
|
|
25
|
+
* either way and Postgres is what should say so.
|
|
26
|
+
*/
|
|
27
|
+
const IDENT_CHAR = /[A-Za-z0-9_]/;
|
|
28
|
+
const STATEMENT_BREAKPOINT = '--> statement-breakpoint';
|
|
29
|
+
/** Splits SQL into statements, stripping comments. */
|
|
30
|
+
export function scanStatements(sql, options = {}) {
|
|
31
|
+
const statements = [];
|
|
32
|
+
let buf = '';
|
|
33
|
+
const flush = () => {
|
|
34
|
+
const stmt = buf.trim();
|
|
35
|
+
if (stmt.length > 0)
|
|
36
|
+
statements.push(stmt);
|
|
37
|
+
buf = '';
|
|
38
|
+
};
|
|
39
|
+
let i = 0;
|
|
40
|
+
while (i < sql.length) {
|
|
41
|
+
const c = sql[i];
|
|
42
|
+
const next = sql[i + 1];
|
|
43
|
+
// Line comment — runs to the newline, which is left to land as whitespace.
|
|
44
|
+
if (c === '-' && next === '-') {
|
|
45
|
+
const nl = sql.indexOf('\n', i);
|
|
46
|
+
const end = nl === -1 ? sql.length : nl;
|
|
47
|
+
if (options.breakpointSeparator === true && sql.slice(i, end).trim() === STATEMENT_BREAKPOINT)
|
|
48
|
+
flush();
|
|
49
|
+
i = end;
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
// Block comment — Postgres nests these, so track depth.
|
|
53
|
+
if (c === '/' && next === '*') {
|
|
54
|
+
i = skipBlockComment(sql, i);
|
|
55
|
+
buf += ' ';
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
// Dollar-quoted body — nothing inside is special, only the matching tag ends it.
|
|
59
|
+
const tag = dollarTagAt(sql, i);
|
|
60
|
+
if (tag !== null) {
|
|
61
|
+
const close = sql.indexOf(tag, i + tag.length);
|
|
62
|
+
const end = close === -1 ? sql.length : close + tag.length;
|
|
63
|
+
buf += sql.slice(i, end);
|
|
64
|
+
i = end;
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
// String literal. Backslashes escape only in an E'' string.
|
|
68
|
+
if (c === "'") {
|
|
69
|
+
const end = consumeQuoted(sql, i, "'", isEscapeString(sql, i));
|
|
70
|
+
buf += sql.slice(i, end);
|
|
71
|
+
i = end;
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
// Quoted identifier.
|
|
75
|
+
if (c === '"') {
|
|
76
|
+
const end = consumeQuoted(sql, i, '"', false);
|
|
77
|
+
buf += sql.slice(i, end);
|
|
78
|
+
i = end;
|
|
79
|
+
continue;
|
|
80
|
+
}
|
|
81
|
+
if (c === ';') {
|
|
82
|
+
flush();
|
|
83
|
+
i++;
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
buf += c;
|
|
87
|
+
i++;
|
|
88
|
+
}
|
|
89
|
+
flush();
|
|
90
|
+
return statements;
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Removes comments, leaving literals and dollar-quoted bodies intact and
|
|
94
|
+
* statement separators where they were. For callers that need to test SQL
|
|
95
|
+
* against a pattern without a comment supplying a false match or hiding a
|
|
96
|
+
* real one.
|
|
97
|
+
*/
|
|
98
|
+
export function stripComments(sql) {
|
|
99
|
+
let out = '';
|
|
100
|
+
let i = 0;
|
|
101
|
+
while (i < sql.length) {
|
|
102
|
+
const c = sql[i];
|
|
103
|
+
const next = sql[i + 1];
|
|
104
|
+
if (c === '-' && next === '-') {
|
|
105
|
+
const nl = sql.indexOf('\n', i);
|
|
106
|
+
i = nl === -1 ? sql.length : nl;
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
if (c === '/' && next === '*') {
|
|
110
|
+
i = skipBlockComment(sql, i);
|
|
111
|
+
out += ' ';
|
|
112
|
+
continue;
|
|
113
|
+
}
|
|
114
|
+
const tag = dollarTagAt(sql, i);
|
|
115
|
+
if (tag !== null) {
|
|
116
|
+
const close = sql.indexOf(tag, i + tag.length);
|
|
117
|
+
const end = close === -1 ? sql.length : close + tag.length;
|
|
118
|
+
out += sql.slice(i, end);
|
|
119
|
+
i = end;
|
|
120
|
+
continue;
|
|
121
|
+
}
|
|
122
|
+
if (c === "'" || c === '"') {
|
|
123
|
+
const end = consumeQuoted(sql, i, c, c === "'" && isEscapeString(sql, i));
|
|
124
|
+
out += sql.slice(i, end);
|
|
125
|
+
i = end;
|
|
126
|
+
continue;
|
|
127
|
+
}
|
|
128
|
+
out += c;
|
|
129
|
+
i++;
|
|
130
|
+
}
|
|
131
|
+
return out;
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Index of the first character of actual SQL in `sql` — i.e. past any leading
|
|
135
|
+
* whitespace and comments. Lets a text rewriter skip a leading comment block
|
|
136
|
+
* without rewriting words inside it.
|
|
137
|
+
*/
|
|
138
|
+
export function codeStartOffset(sql) {
|
|
139
|
+
let i = 0;
|
|
140
|
+
while (i < sql.length) {
|
|
141
|
+
const c = sql[i];
|
|
142
|
+
if (/\s/.test(c)) {
|
|
143
|
+
i++;
|
|
144
|
+
continue;
|
|
145
|
+
}
|
|
146
|
+
if (c === '-' && sql[i + 1] === '-') {
|
|
147
|
+
const nl = sql.indexOf('\n', i);
|
|
148
|
+
i = nl === -1 ? sql.length : nl;
|
|
149
|
+
continue;
|
|
150
|
+
}
|
|
151
|
+
if (c === '/' && sql[i + 1] === '*') {
|
|
152
|
+
i = skipBlockComment(sql, i);
|
|
153
|
+
continue;
|
|
154
|
+
}
|
|
155
|
+
return i;
|
|
156
|
+
}
|
|
157
|
+
return sql.length;
|
|
158
|
+
}
|
|
159
|
+
/** `start` indexes the opening `/*`. Returns the index just past the matching close. */
|
|
160
|
+
function skipBlockComment(sql, start) {
|
|
161
|
+
let depth = 0;
|
|
162
|
+
let i = start;
|
|
163
|
+
while (i < sql.length) {
|
|
164
|
+
if (sql[i] === '/' && sql[i + 1] === '*') {
|
|
165
|
+
depth++;
|
|
166
|
+
i += 2;
|
|
167
|
+
continue;
|
|
168
|
+
}
|
|
169
|
+
if (sql[i] === '*' && sql[i + 1] === '/') {
|
|
170
|
+
depth--;
|
|
171
|
+
i += 2;
|
|
172
|
+
if (depth === 0)
|
|
173
|
+
return i;
|
|
174
|
+
continue;
|
|
175
|
+
}
|
|
176
|
+
i++;
|
|
177
|
+
}
|
|
178
|
+
return sql.length;
|
|
179
|
+
}
|
|
180
|
+
/**
|
|
181
|
+
* Returns the dollar-quote tag opening at `i` (`$$`, `$body$`), or null.
|
|
182
|
+
* Tags may not start with a digit, which is what keeps `$1` positional
|
|
183
|
+
* parameters from being read as the start of a quoted body.
|
|
184
|
+
*/
|
|
185
|
+
function dollarTagAt(sql, i) {
|
|
186
|
+
if (sql[i] !== '$')
|
|
187
|
+
return null;
|
|
188
|
+
let j = i + 1;
|
|
189
|
+
while (j < sql.length && IDENT_CHAR.test(sql[j]))
|
|
190
|
+
j++;
|
|
191
|
+
if (sql[j] !== '$')
|
|
192
|
+
return null;
|
|
193
|
+
if (/[0-9]/.test(sql[i + 1] ?? ''))
|
|
194
|
+
return null;
|
|
195
|
+
return sql.slice(i, j + 1);
|
|
196
|
+
}
|
|
197
|
+
/** True when the quote at `i` opens an `E''` escape string. */
|
|
198
|
+
function isEscapeString(sql, i) {
|
|
199
|
+
const prev = sql[i - 1];
|
|
200
|
+
if (prev !== 'e' && prev !== 'E')
|
|
201
|
+
return false;
|
|
202
|
+
const before = sql[i - 2];
|
|
203
|
+
return before === undefined || !IDENT_CHAR.test(before);
|
|
204
|
+
}
|
|
205
|
+
/** Returns the index just past the closing quote, or end of input if unterminated. */
|
|
206
|
+
function consumeQuoted(sql, start, quote, backslashEscapes) {
|
|
207
|
+
let i = start + 1;
|
|
208
|
+
while (i < sql.length) {
|
|
209
|
+
const c = sql[i];
|
|
210
|
+
if (backslashEscapes && c === '\\') {
|
|
211
|
+
i += 2;
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
if (c === quote) {
|
|
215
|
+
if (sql[i + 1] === quote) {
|
|
216
|
+
i += 2;
|
|
217
|
+
continue;
|
|
218
|
+
}
|
|
219
|
+
return i + 1;
|
|
220
|
+
}
|
|
221
|
+
i++;
|
|
222
|
+
}
|
|
223
|
+
return sql.length;
|
|
224
|
+
}
|
|
225
|
+
//# sourceMappingURL=statements.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"statements.js","sourceRoot":"","sources":["../../../src/data/migrate/statements.ts"],"names":[],"mappings":"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"}
|