@prisma-psm/pg 1.0.6 → 1.0.8

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 (47) hide show
  1. package/package.json +1 -1
  2. package/src/index.js +2 -2
  3. package/src/index.ts +6 -4
  4. package/src/parser/backup/engine.d.ts.map +1 -1
  5. package/src/parser/backup/engine.js +36 -21
  6. package/src/parser/backup/engine.js.map +1 -1
  7. package/src/parser/backup/engine.ts +36 -16
  8. package/src/parser/notice.js +1 -1
  9. package/src/parser/notice.ts +2 -2
  10. package/src/parser/parser.d.ts +1 -0
  11. package/src/parser/parser.d.ts.map +1 -1
  12. package/src/parser/parser.js +3 -1
  13. package/src/parser/parser.js.map +1 -1
  14. package/src/parser/parser.ts +12 -2
  15. package/src/parser/schama.d.ts +3 -0
  16. package/src/parser/schama.d.ts.map +1 -0
  17. package/src/parser/schama.js +16 -0
  18. package/src/parser/schama.js.map +1 -0
  19. package/src/parser/schama.ts +14 -0
  20. package/src/parser/sql.d.ts.map +1 -1
  21. package/src/parser/sql.js +3 -0
  22. package/src/parser/sql.js.map +1 -1
  23. package/src/parser/sql.ts +7 -2
  24. package/src/parser/sys.js +2 -2
  25. package/src/parser/sys.ts +3 -3
  26. package/src/parser/table/engine.js +2 -2
  27. package/src/parser/table/engine.ts +3 -3
  28. package/src/sql/catalog-maps.d.ts +1 -0
  29. package/src/sql/catalog-maps.d.ts.map +1 -0
  30. package/src/sql/catalog-maps.js +283 -0
  31. package/src/sql/catalog-maps.js.map +1 -0
  32. package/src/sql/catalog-maps.ts +281 -0
  33. package/src/sql/sql-builder.d.ts +1 -0
  34. package/src/sql/sql-builder.d.ts.map +1 -0
  35. package/src/sql/sql-builder.js +256 -0
  36. package/src/sql/sql-builder.js.map +1 -0
  37. package/src/sql/sql-builder.ts +254 -0
  38. package/src/utils/escape.d.ts +5 -1
  39. package/src/utils/escape.d.ts.map +1 -1
  40. package/src/utils/escape.js +328 -4
  41. package/src/utils/escape.js.map +1 -1
  42. package/src/utils/escape.ts +331 -4
  43. package/src/utils/script-util.d.ts +26 -0
  44. package/src/utils/script-util.d.ts.map +1 -0
  45. package/src/utils/script-util.js +95 -0
  46. package/src/utils/script-util.js.map +1 -0
  47. package/src/utils/script-util.ts +105 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@prisma-psm/pg",
3
- "version": "1.0.6",
3
+ "version": "1.0.8",
4
4
  "description": "Prisma Safe Migration Postgres Driver",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
- const sql_1 = require("./parser/sql");
3
2
  const parser_1 = require("./parser/parser");
4
3
  const migration_1 = require("./migration");
4
+ const sql_1 = require("./parser/sql");
5
5
  function prepare(model) {
6
6
  if (!model.schema)
7
7
  model.schema = "public";
@@ -24,7 +24,7 @@ const driver = {
24
24
  };
25
25
  return generator;
26
26
  },
27
- prepare
27
+ prepare,
28
28
  };
29
29
  module.exports = driver;
30
30
  //# sourceMappingURL=index.js.map
package/src/index.ts CHANGED
@@ -1,14 +1,15 @@
1
- import {sql} from "./parser/sql";
2
1
  import {PSMDriver, ModelOptions, PSMGenerator} from "@prisma-psm/core";
3
2
  import {parser} from "./parser/parser";
4
3
  import {migrate,migrated} from "./migration";
5
-
4
+ import {sql} from "./parser/sql";
6
5
 
7
6
 
8
7
 
9
8
  function prepare( model:ModelOptions ){
10
9
  if( !model.schema ) model.schema = "public";
11
10
  }
11
+
12
+
12
13
  const driver :PSMDriver = {
13
14
  migrated:( opts )=>{
14
15
  return migrated( opts );
@@ -21,6 +22,7 @@ const driver :PSMDriver = {
21
22
 
22
23
  generator:(opts) => {
23
24
  let response = parser(opts);
25
+
24
26
  const generator: PSMGenerator = {
25
27
  migrate: () => sql( { mode: "migrate" }, response),
26
28
  check: () => sql( { mode: "check" }, response),
@@ -28,6 +30,6 @@ const driver :PSMDriver = {
28
30
  }
29
31
  return generator;
30
32
  },
31
- prepare
32
- }
33
+ prepare,
34
+ } as PSMDriver
33
35
  export = driver
@@ -1 +1 @@
1
- {"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAG3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAK/C,wBAAgB,2BAA2B,CAAE,IAAI,EAAE,qBAAqB,YAoCvE;AAGD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAC,MAAM,CAAA;IACb,KAAK,EAAC,YAAY,CAAC;IACnB,MAAM,EAAC,qBAAqB,CAAA;CAC/B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAC,cAAc,GAAI;IACpD,IAAI,EAAC,MAAM,EAAE,CAAA;IACb,QAAQ,EAAC,MAAM,EAAE,CAAA;CACpB,CA2HA;AAED,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IACxD,IAAI,EAAC,MAAM,CAAA;IACX,EAAE,EAAC,MAAM,CAAA;IACT,GAAG,CAAC,EAAC,MAAM,CAAA;CACd;AACD,wBAAgB,gBAAgB,CAAE,IAAI,EAAC,oBAAoB,YAkB1D"}
1
+ {"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAG3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAK/C,wBAAgB,2BAA2B,CAAE,IAAI,EAAE,qBAAqB,YAoCvE;AAGD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAC,MAAM,CAAA;IACb,KAAK,EAAC,YAAY,CAAC;IACnB,MAAM,EAAC,qBAAqB,CAAA;CAC/B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAC,cAAc,GAAI;IACpD,IAAI,EAAC,MAAM,EAAE,CAAA;IACb,QAAQ,EAAC,MAAM,EAAE,CAAA;CACpB,CAiJA;AAED,MAAM,WAAW,oBAAqB,SAAQ,cAAc;IACxD,IAAI,EAAC,MAAM,CAAA;IACX,EAAE,EAAC,MAAM,CAAA;IACT,GAAG,CAAC,EAAC,MAAM,CAAA;CACd;AACD,wBAAgB,gBAAgB,CAAE,IAAI,EAAC,oBAAoB,YAgB1D"}
@@ -46,7 +46,7 @@ function createFunctionRestoreSerial(opts) {
46
46
  ], tab);
47
47
  }
48
48
  function restoreBackupSQL(opts) {
49
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
49
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
50
50
  const schema = (0, escape_1.oid)(opts.model.schema);
51
51
  const source = (0, escape_1.oid)(opts.source);
52
52
  const shadow = (0, escape_1.oid)(opts.parser.shadow);
@@ -61,12 +61,16 @@ function restoreBackupSQL(opts) {
61
61
  const columns = opts.model.fields.filter(filter)
62
62
  .map(value => ` ${(0, escape_1.oid)(value.name)}`)
63
63
  .join(", ");
64
+ const DEFAULT_WHEN = `true`;
64
65
  const DEFAULT_QUERY = `select * from ${schema}.${source}`;
66
+ const DEFAULT_SOURCE_CHECKER = `select 1 from pg_catalog.pg_tables t where t.tablename = ${(0, escape_1.lit)(opts.model.name)} and t.schemaname = ${(0, escape_1.lit)(opts.model.schema)}`;
65
67
  const DEFAULT_RESOLVER = opts.model.fields.filter(filter)
66
68
  .map(value => {
67
69
  return ` ${(0, escape_1.oid)(value.dbName || value.name)}`;
68
70
  })
69
71
  .join(", ");
72
+ let source_exists = DEFAULT_SOURCE_CHECKER;
73
+ let when = DEFAULT_WHEN;
70
74
  const revision_resolver = opts.model.fields.filter(filter)
71
75
  .map(field => {
72
76
  var _a, _b;
@@ -78,14 +82,18 @@ function restoreBackupSQL(opts) {
78
82
  .join(", ");
79
83
  let revision_query = DEFAULT_QUERY;
80
84
  const expression = (_e = (_d = (_c = opts.model.psm) === null || _c === void 0 ? void 0 : _c.backup) === null || _d === void 0 ? void 0 : _d.rev) === null || _e === void 0 ? void 0 : _e.expression;
81
- if (((_h = (_g = (_f = opts.model.psm) === null || _f === void 0 ? void 0 : _f.backup) === null || _g === void 0 ? void 0 : _g.rev) === null || _h === void 0 ? void 0 : _h.from) === "query"
85
+ const exists = (_h = (_g = (_f = opts.model.psm) === null || _f === void 0 ? void 0 : _f.backup) === null || _g === void 0 ? void 0 : _g.rev) === null || _h === void 0 ? void 0 : _h.exists;
86
+ if (!!(exists === null || exists === void 0 ? void 0 : exists.length)) {
87
+ source_exists = exists;
88
+ }
89
+ if (((_l = (_k = (_j = opts.model.psm) === null || _j === void 0 ? void 0 : _j.backup) === null || _k === void 0 ? void 0 : _k.rev) === null || _l === void 0 ? void 0 : _l.from) === "query"
82
90
  && !!expression)
83
91
  revision_query = expression;
84
- else if (((_l = (_k = (_j = opts.model.psm) === null || _j === void 0 ? void 0 : _j.backup) === null || _k === void 0 ? void 0 : _k.rev) === null || _l === void 0 ? void 0 : _l.from) === "query:linked"
92
+ else if (((_p = (_o = (_m = opts.model.psm) === null || _m === void 0 ? void 0 : _m.backup) === null || _o === void 0 ? void 0 : _o.rev) === null || _p === void 0 ? void 0 : _p.from) === "query:linked"
85
93
  && !!expression
86
- && !!((_o = (_m = opts.model.psm) === null || _m === void 0 ? void 0 : _m.query) === null || _o === void 0 ? void 0 : _o[expression]))
87
- revision_query = (_q = (_p = opts.model.psm) === null || _p === void 0 ? void 0 : _p.query) === null || _q === void 0 ? void 0 : _q[expression];
88
- else if (((_t = (_s = (_r = opts.model.psm) === null || _r === void 0 ? void 0 : _r.backup) === null || _s === void 0 ? void 0 : _s.rev) === null || _t === void 0 ? void 0 : _t.from) === "model" && !!expression) {
94
+ && !!((_r = (_q = opts.model.psm) === null || _q === void 0 ? void 0 : _q.query) === null || _r === void 0 ? void 0 : _r[expression]))
95
+ revision_query = (_t = (_s = opts.model.psm) === null || _s === void 0 ? void 0 : _s.query) === null || _t === void 0 ? void 0 : _t[expression];
96
+ else if (((_w = (_v = (_u = opts.model.psm) === null || _u === void 0 ? void 0 : _u.backup) === null || _v === void 0 ? void 0 : _v.rev) === null || _w === void 0 ? void 0 : _w.from) === "model" && !!expression) {
89
97
  let model = opts.parser.models.find(value => value.model === expression);
90
98
  if (!!model)
91
99
  revision_query = `select * from ${(0, escape_1.oid)(model.schema || "public")}.${(0, escape_1.oid)(model.dbName || model.name)}`;
@@ -93,11 +101,11 @@ function restoreBackupSQL(opts) {
93
101
  const sys = (0, escape_1.oid)(opts.parser.sys);
94
102
  let revision = "null";
95
103
  const relation = `${schema}.${table}`;
96
- if ((_w = (_v = (_u = opts.model.psm) === null || _u === void 0 ? void 0 : _u.backup) === null || _v === void 0 ? void 0 : _v.rev) === null || _w === void 0 ? void 0 : _w.version)
97
- revision = (0, escape_1.val)((_y = (_x = opts.model.psm) === null || _x === void 0 ? void 0 : _x.backup) === null || _y === void 0 ? void 0 : _y.rev.version);
104
+ if ((_z = (_y = (_x = opts.model.psm) === null || _x === void 0 ? void 0 : _x.backup) === null || _y === void 0 ? void 0 : _y.rev) === null || _z === void 0 ? void 0 : _z.version)
105
+ revision = (0, escape_1.lit)((_1 = (_0 = opts.model.psm) === null || _0 === void 0 ? void 0 : _0.backup) === null || _1 === void 0 ? void 0 : _1.rev.version);
98
106
  let always_query = DEFAULT_QUERY;
99
107
  let always_resolver = DEFAULT_RESOLVER;
100
- if (((_1 = (_0 = (_z = opts.model.psm) === null || _z === void 0 ? void 0 : _z.backup) === null || _0 === void 0 ? void 0 : _0.rev) === null || _1 === void 0 ? void 0 : _1.apply) === "ALWAYS" && !!revision_query && !!revision_resolver) {
108
+ if (((_4 = (_3 = (_2 = opts.model.psm) === null || _2 === void 0 ? void 0 : _2.backup) === null || _3 === void 0 ? void 0 : _3.rev) === null || _4 === void 0 ? void 0 : _4.apply) === "ALWAYS" && !!revision_query && !!revision_resolver) {
101
109
  always_query = revision_query;
102
110
  always_resolver = revision_resolver;
103
111
  revision = `always-${opts.parser.migration}`;
@@ -106,8 +114,18 @@ function restoreBackupSQL(opts) {
106
114
  do $$
107
115
  declare
108
116
  _revision character varying := ${revision}::character varying;
109
- _relation character varying := ${(0, escape_1.val)(relation)}::character varying;
117
+ _relation character varying := ${(0, escape_1.lit)(relation)}::character varying;
118
+ ___whenX1025475 boolean;
110
119
  begin
120
+ if not exists( ${source_exists} ) then
121
+ return;
122
+ end if;
123
+
124
+ ___whenX1025475 := (${when});
125
+ if not coalesce( ___whenX1025475, true ) then
126
+ return;
127
+ end if;
128
+
111
129
  if _revision is not null and not exists(
112
130
  select 1
113
131
  from ${sys}.revision r
@@ -150,7 +168,7 @@ function restoreBackupSQL(opts) {
150
168
  registry: [
151
169
  (0, notice_1.notice)(`REGISTRY RESTORE OF BACKUP FOR MODEL ${opts.model.model}`),
152
170
  (0, sys_1.createRevision)(opts.parser, {
153
- revision: (_4 = (_3 = (_2 = opts.model.psm) === null || _2 === void 0 ? void 0 : _2.backup) === null || _3 === void 0 ? void 0 : _3.rev) === null || _4 === void 0 ? void 0 : _4.version,
171
+ revision: (_7 = (_6 = (_5 = opts.model.psm) === null || _5 === void 0 ? void 0 : _5.backup) === null || _6 === void 0 ? void 0 : _6.rev) === null || _7 === void 0 ? void 0 : _7.version,
154
172
  relation: relation,
155
173
  hash: (0, sha_1.migrationHash)(opts.parser.migration, `restore:data-${relation}`),
156
174
  operation: `restore:data-${relation}`
@@ -160,17 +178,14 @@ function restoreBackupSQL(opts) {
160
178
  };
161
179
  }
162
180
  function restoreSerialSQL(opts) {
163
- let seq = "null";
164
- if (!!opts.seq)
165
- seq = (0, escape_1.val)(opts.seq);
166
181
  const args = [
167
- ` schema := ${(0, escape_1.val)(opts.model.schema)}::character varying`,
168
- ` source := ${(0, escape_1.val)(opts.source)}::character varying`,
169
- ` shadow := ${(0, escape_1.val)(opts.parser.shadow)}::character varying`,
170
- ` temp := ${(0, escape_1.val)(opts.model.temp)}::character varying`,
171
- ` "from" := ${(0, escape_1.val)(opts.from)}::character varying`,
172
- ` "to" := ${(0, escape_1.val)(opts.to)}::character varying`,
173
- ` "seq" := ${seq}::character varying`,
182
+ ` schema := ${(0, escape_1.lit)(opts.model.schema, escape_1.VARCHAR)}`,
183
+ ` source := ${(0, escape_1.lit)(opts.source, escape_1.VARCHAR)}`,
184
+ ` shadow := ${(0, escape_1.lit)(opts.parser.shadow, escape_1.VARCHAR)}`,
185
+ ` temp := ${(0, escape_1.lit)(opts.model.temp, escape_1.VARCHAR)}`,
186
+ ` "from" := ${(0, escape_1.lit)(opts.from, escape_1.VARCHAR)}`,
187
+ ` "to" := ${(0, escape_1.lit)(opts.to, escape_1.VARCHAR)}`,
188
+ ` "seq" := ${(0, escape_1.lit)(opts.seq, escape_1.VARCHAR)}`,
174
189
  ];
175
190
  return [
176
191
  (0, notice_1.notice)(`RESTORE SEQUENCE OF FIELD ${opts.to} FROM MODEL ${opts.model.model}`),
@@ -1 +1 @@
1
- {"version":3,"file":"engine.js","sourceRoot":"","sources":["engine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"engine.js","sourceRoot":"","sources":["engine.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import {FieldOption, ModelOptions} from "@prisma-psm/core";
2
- import {oid, val} from "../../utils/escape";
2
+ import {oid, lit, VARCHAR} from "../../utils/escape";
3
3
  import { noTab } from "../../utils/tabs";
4
4
  import { PostgresParserOptions } from "../def";
5
5
  import {notice} from "../notice";
@@ -58,8 +58,8 @@ export function restoreBackupSQL(opts:RestoreOptions ): {
58
58
  const schema = oid(opts.model.schema);
59
59
  const source = oid(opts.source);
60
60
  const shadow = oid(opts.parser.shadow);
61
- const table = oid(opts.model.name);
62
- const temp = oid(opts.model.temp);
61
+ const table = oid(opts.model.name);
62
+ const temp = oid(opts.model.temp);
63
63
 
64
64
  if( opts.model.psm?.backup?.skip ) return null as any;
65
65
 
@@ -69,12 +69,15 @@ export function restoreBackupSQL(opts:RestoreOptions ): {
69
69
  ;
70
70
  }
71
71
 
72
+
72
73
  const columns = opts.model.fields.filter( filter )
73
74
  .map( value => ` ${oid(value.name)}` )
74
75
  .join(", ")
75
76
  ;
76
77
 
78
+ const DEFAULT_WHEN = `true`;
77
79
  const DEFAULT_QUERY = `select * from ${schema}.${source}`;
80
+ const DEFAULT_SOURCE_CHECKER = `select 1 from pg_catalog.pg_tables t where t.tablename = ${lit(opts.model.name)} and t.schemaname = ${lit(opts.model.schema)}`;
78
81
  const DEFAULT_RESOLVER = opts.model.fields.filter( filter )
79
82
  .map( value => {
80
83
  return ` ${oid(value.dbName||value.name)}`;
@@ -82,6 +85,9 @@ export function restoreBackupSQL(opts:RestoreOptions ): {
82
85
  .join(", ")
83
86
  ;
84
87
 
88
+ let source_exists = DEFAULT_SOURCE_CHECKER;
89
+ let when = DEFAULT_WHEN;
90
+
85
91
  const revision_resolver = opts.model.fields.filter( filter )
86
92
  .map( field => {
87
93
 
@@ -94,9 +100,15 @@ export function restoreBackupSQL(opts:RestoreOptions ): {
94
100
 
95
101
  let revision_query = DEFAULT_QUERY;
96
102
  const expression = opts.model.psm?.backup?.rev?.expression;
103
+ const exists = opts.model.psm?.backup?.rev?.exists;
104
+
105
+ if( !!exists?.length ){
106
+ source_exists = exists;
107
+ }
108
+
97
109
  if( opts.model.psm?.backup?.rev?.from === "query"
98
110
  && !!expression
99
- ) revision_query = expression
111
+ ) revision_query = expression;
100
112
 
101
113
  else if( opts.model.psm?.backup?.rev?.from === "query:linked"
102
114
  && !!expression
@@ -111,7 +123,7 @@ export function restoreBackupSQL(opts:RestoreOptions ): {
111
123
  const sys = oid( opts.parser.sys );
112
124
  let revision= "null";
113
125
  const relation = `${schema}.${table}`;
114
- if( opts.model.psm?.backup?.rev?.version ) revision = val( opts.model.psm?.backup?.rev.version );
126
+ if( opts.model.psm?.backup?.rev?.version ) revision = lit( opts.model.psm?.backup?.rev.version );
115
127
 
116
128
  let always_query = DEFAULT_QUERY;
117
129
  let always_resolver = DEFAULT_RESOLVER;
@@ -121,12 +133,22 @@ export function restoreBackupSQL(opts:RestoreOptions ): {
121
133
  revision = `always-${opts.parser.migration}`;
122
134
  }
123
135
 
124
- const next = `
136
+ const next =`
125
137
  do $$
126
138
  declare
127
139
  _revision character varying := ${revision}::character varying;
128
- _relation character varying := ${val(relation)}::character varying;
140
+ _relation character varying := ${lit(relation)}::character varying;
141
+ ___whenX1025475 boolean;
129
142
  begin
143
+ if not exists( ${source_exists} ) then
144
+ return;
145
+ end if;
146
+
147
+ ___whenX1025475 := (${when});
148
+ if not coalesce( ___whenX1025475, true ) then
149
+ return;
150
+ end if;
151
+
130
152
  if _revision is not null and not exists(
131
153
  select 1
132
154
  from ${sys}.revision r
@@ -185,16 +207,14 @@ export interface RestoreSerialOptions extends RestoreOptions {
185
207
  seq?:string
186
208
  }
187
209
  export function restoreSerialSQL( opts:RestoreSerialOptions) {
188
- let seq = "null";
189
- if( !!opts.seq ) seq = val( opts.seq );
190
210
  const args = [
191
- ` schema := ${val(opts.model.schema)}::character varying`,
192
- ` source := ${val(opts.source)}::character varying`,
193
- ` shadow := ${val(opts.parser.shadow)}::character varying`,
194
- ` temp := ${val(opts.model.temp)}::character varying`,
195
- ` "from" := ${val(opts.from)}::character varying`,
196
- ` "to" := ${val(opts.to)}::character varying`,
197
- ` "seq" := ${seq}::character varying`,
211
+ ` schema := ${lit(opts.model.schema, VARCHAR)}`,
212
+ ` source := ${lit(opts.source, VARCHAR)}`,
213
+ ` shadow := ${lit(opts.parser.shadow, VARCHAR)}`,
214
+ ` temp := ${lit(opts.model.temp, VARCHAR)}`,
215
+ ` "from" := ${lit(opts.from, VARCHAR)}`,
216
+ ` "to" := ${lit(opts.to, VARCHAR)}`,
217
+ ` "seq" := ${lit( opts.seq, VARCHAR)}`,
198
218
  ];
199
219
  return [
200
220
  notice( `RESTORE SEQUENCE OF FIELD ${opts.to} FROM MODEL ${opts.model.model}`),
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.notice = notice;
4
4
  const escape_1 = require("../utils/escape");
5
5
  function notice(message) {
6
- return `do $$ begin raise notice '%', ${(0, escape_1.val)(message)}; end $$;`;
6
+ return `do $$ begin raise notice '%', ${(0, escape_1.lit)(message)}; end $$;`;
7
7
  }
8
8
  //# sourceMappingURL=notice.js.map
@@ -1,5 +1,5 @@
1
- import {val} from "../utils/escape";
1
+ import {lit} from "../utils/escape";
2
2
 
3
3
  export function notice(message:string) {
4
- return `do $$ begin raise notice '%', ${val( message )}; end $$;`
4
+ return `do $$ begin raise notice '%', ${lit( message )}; end $$;`
5
5
  }
@@ -3,6 +3,7 @@ export interface ParserResult {
3
3
  options: PostgresParserOptions;
4
4
  models: string[];
5
5
  core: {
6
+ schema: string[];
6
7
  structure: string[];
7
8
  functions: string[];
8
9
  migration: string[];
@@ -1 +1 @@
1
- {"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,gBAAgB,EAAE,qBAAqB,EAAC,MAAM,OAAO,CAAC;AAG9D,MAAM,WAAW,YAAY;IACzB,OAAO,EAAC,qBAAqB,CAAA;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE;QACF,SAAS,EAAC,MAAM,EAAE,CAAA;QAClB,SAAS,EAAC,MAAM,EAAE,CAAA;QAClB,SAAS,EAAC,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,MAAM,EAAE;QAAE,MAAM,EAAC,MAAM,EAAE,CAAC;QAAE,IAAI,EAAC,MAAM,EAAE,CAAA;KAAE,CAAC;IAC5C,MAAM,EAAE;QACJ,CAAC,CAAC,EAAC,MAAM,GAAE,gBAAgB,CAAA;KAC9B,CAAA;CACJ;AAED,wBAAgB,MAAM,CAAE,IAAI,EAAC,qBAAqB,gBAiEjD"}
1
+ {"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["parser.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,gBAAgB,EAAE,qBAAqB,EAAC,MAAM,OAAO,CAAC;AAI9D,MAAM,WAAW,YAAY;IACzB,OAAO,EAAC,qBAAqB,CAAA;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE;QACF,MAAM,EAAC,MAAM,EAAE,CAAA;QACf,SAAS,EAAC,MAAM,EAAE,CAAA;QAClB,SAAS,EAAC,MAAM,EAAE,CAAA;QAClB,SAAS,EAAC,MAAM,EAAE,CAAA;KACrB,CAAA;IACD,MAAM,EAAE;QAAE,MAAM,EAAC,MAAM,EAAE,CAAC;QAAE,IAAI,EAAC,MAAM,EAAE,CAAA;KAAE,CAAC;IAC5C,MAAM,EAAE;QACJ,CAAC,CAAC,EAAC,MAAM,GAAE,gBAAgB,CAAA;KAC9B,CAAA;CACJ;AAED,wBAAgB,MAAM,CAAE,IAAI,EAAC,qBAAqB,gBAyEjD"}
@@ -7,6 +7,7 @@ const sys_1 = require("./sys");
7
7
  const dependencies_1 = require("./dependencies");
8
8
  const modelParser_1 = require("./modelParser");
9
9
  const engine_1 = require("./backup/engine");
10
+ const schama_1 = require("./schama");
10
11
  function parser(opts) {
11
12
  const schemas = new Set();
12
13
  let response = {
@@ -14,6 +15,7 @@ function parser(opts) {
14
15
  parsed: {},
15
16
  models: [],
16
17
  core: {
18
+ schema: (0, schama_1.schema)(opts),
17
19
  structure: (0, sys_1.prepareCore)(opts),
18
20
  functions: (0, engine_1.createFunctionRestoreSerial)(opts),
19
21
  migration: (0, sys_1.createMigration)(opts),
@@ -39,7 +41,7 @@ function parser(opts) {
39
41
  unique: { create: [], drop: [] },
40
42
  indexes: { create: [], drop: [] },
41
43
  dependencies: [],
42
- dependents: []
44
+ dependents: [],
43
45
  };
44
46
  let backup = true;
45
47
  if ((_c = (_b = model.psm) === null || _b === void 0 ? void 0 : _b.backup) === null || _c === void 0 ? void 0 : _c.skip)
@@ -1 +1 @@
1
- {"version":3,"file":"parser.js","sourceRoot":"","sources":["parser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parser.js","sourceRoot":"","sources":["parser.ts"],"names":[],"mappings":"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"}
@@ -6,12 +6,14 @@ import {reverseDependencies} from "./dependencies";
6
6
  import {modelParser} from "./modelParser";
7
7
  import {createFunctionRestoreSerial} from "./backup/engine";
8
8
  import {ParseModelResult, PostgresParserOptions} from "./def";
9
+ import {schema} from "./schama";
9
10
 
10
11
 
11
12
  export interface ParserResult {
12
13
  options:PostgresParserOptions
13
14
  models: string[],
14
15
  core: {
16
+ schema:string[]
15
17
  structure:string[]
16
18
  functions:string[]
17
19
  migration:string[]
@@ -29,6 +31,7 @@ export function parser( opts:PostgresParserOptions){
29
31
  parsed:{},
30
32
  models:[],
31
33
  core: {
34
+ schema: schema( opts ),
32
35
  structure: prepareCore(opts),
33
36
  functions: createFunctionRestoreSerial(opts),
34
37
  migration: createMigration(opts),
@@ -46,6 +49,7 @@ export function parser( opts:PostgresParserOptions){
46
49
  if( model.psm?.view ) return;
47
50
  model.indexes = opts.indexes.filter( value => value.model === model.model );
48
51
 
52
+
49
53
  const modelDDL = modelParser( model, opts );
50
54
  const parsed:ParseModelResult = {
51
55
  model: model,
@@ -56,17 +60,20 @@ export function parser( opts:PostgresParserOptions){
56
60
  unique:{ create:[], drop:[] },
57
61
  indexes:{ create:[], drop:[] },
58
62
  dependencies:[],
59
- dependents:[]
63
+ dependents:[],
60
64
  }
61
65
 
62
66
  let backup = true;
63
67
  if( model.psm?.backup?.skip ) backup = false;
64
68
 
69
+
65
70
  if( backup ){
71
+
66
72
  parsed.backup.restore = modelDDL.restore_backup();
67
73
  parsed.backup.restore_serial.push( ...modelDDL.restore_serial());
68
74
  }
69
75
 
76
+
70
77
  parsed.table.create.push( ...modelDDL.create_table());
71
78
  parsed.primary.create.push( ...modelDDL.create_primary_keys())
72
79
  parsed.foreign.create.push( ...modelDDL.create_foreign_key() );
@@ -85,6 +92,9 @@ export function parser( opts:PostgresParserOptions){
85
92
  response.parsed[model.name] = parsed;
86
93
  response.models.push( model.name)
87
94
  });
88
- reverseDependencies( Object.values( response.parsed ))
95
+
96
+ reverseDependencies( Object.values( response.parsed ));
97
+
98
+
89
99
  return response;
90
100
  }
@@ -0,0 +1,3 @@
1
+ import { PostgresParserOptions } from "./def";
2
+ export declare function schema(parser: PostgresParserOptions): string[];
3
+ //# sourceMappingURL=schama.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schama.d.ts","sourceRoot":"","sources":["schama.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,qBAAqB,EAAC,MAAM,OAAO,CAAC;AAG5C,wBAAgB,MAAM,CAAE,MAAM,EAAC,qBAAqB,YAUnD"}
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.schema = schema;
4
+ const escape_1 = require("../utils/escape");
5
+ function schema(parser) {
6
+ let schemas = new Set();
7
+ parser.models.forEach(value => {
8
+ let schema = value.schema || "public";
9
+ if (!schemas.has(schema))
10
+ schemas.add(schema);
11
+ });
12
+ return [...schemas].map(value => {
13
+ return `create schema if not exists ${(0, escape_1.oid)(value)};`;
14
+ });
15
+ }
16
+ //# sourceMappingURL=schama.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"schama.js","sourceRoot":"","sources":["schama.ts"],"names":[],"mappings":";;AAGA,wBAUC;AAZD,4CAAoC;AAEpC,SAAgB,MAAM,CAAE,MAA4B;IAChD,IAAI,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAE,KAAK,CAAC,EAAE;QAC3B,IAAI,MAAM,GAAG,KAAK,CAAC,MAAM,IAAE,QAAQ,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAE,MAAM,CAAE;YAAG,OAAO,CAAC,GAAG,CAAE,MAAM,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAE,KAAK,CAAC,EAAE;QAC7B,OAAO,+BAA+B,IAAA,YAAG,EAAC,KAAK,CAAC,GAAG,CAAA;IACvD,CAAC,CAAC,CAAC;AACP,CAAC"}
@@ -0,0 +1,14 @@
1
+ import {PostgresParserOptions} from "./def";
2
+ import {oid} from "../utils/escape";
3
+
4
+ export function schema( parser:PostgresParserOptions ){
5
+ let schemas = new Set<string>();
6
+ parser.models.forEach( value => {
7
+ let schema = value.schema||"public";
8
+ if( !schemas.has( schema ) ) schemas.add( schema);
9
+ });
10
+
11
+ return [...schemas].map( value => {
12
+ return `create schema if not exists ${oid(value)};`
13
+ });
14
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAEtC,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,OAAO,GAAC,SAAS,GAAC,MAAM,CAAA;CACjC;AACD,wBAAgB,GAAG,CAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,UA2E5D"}
1
+ {"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["sql.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAEtC,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,OAAO,GAAC,SAAS,GAAC,MAAM,CAAA;CACjC;AACD,wBAAgB,GAAG,CAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,UAgF5D"}
package/src/parser/sql.js CHANGED
@@ -54,6 +54,9 @@ function sql(opts, response) {
54
54
  if (["migrate", "check"].includes(opts.mode))
55
55
  commands.push(...value.foreign.create);
56
56
  });
57
+ //Schemas
58
+ if (opts.mode === "migrate")
59
+ commands.push(...response.core.schema);
57
60
  //Drops
58
61
  parsed.filter(value => !!value.foreign.drop.length).forEach(value => {
59
62
  if (opts.mode === "migrate")
@@ -1 +1 @@
1
- {"version":3,"file":"sql.js","sourceRoot":"","sources":["sql.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sql.js","sourceRoot":"","sources":["sql.ts"],"names":[],"mappings":"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"}
package/src/parser/sql.ts CHANGED
@@ -7,6 +7,8 @@ export function sql( opts: SQLOptions, response: ParserResult ) {
7
7
  let parsed = Object.values( response.parsed );
8
8
  const commands:string[] = [];
9
9
 
10
+
11
+
10
12
  commands.push( `/*
11
13
  @PSM - Prisma SAFE MIGRATE
12
14
  @author zootakuxy
@@ -42,14 +44,17 @@ export function sql( opts: SQLOptions, response: ParserResult ) {
42
44
  //Create constraints
43
45
  parsed.filter( value => !!value.primary.create.length ).forEach( value => {
44
46
  if( ["migrate", "check" ].includes(opts.mode)) commands.push( ...value.primary.create );
45
- })
47
+ });
46
48
  parsed.filter( value => !!value.unique.create.length ).forEach( value => {
47
49
  if( ["migrate", "check" ].includes(opts.mode)) commands.push( ...value.unique.create );
48
- })
50
+ });
49
51
  parsed.filter( value => !!value.foreign.create.length ).forEach( value => {
50
52
  if( ["migrate", "check" ].includes(opts.mode)) commands.push( ...value.foreign.create );
51
53
  });
52
54
 
55
+ //Schemas
56
+ if( opts.mode === "migrate" ) commands.push( ...response.core.schema );
57
+
53
58
  //Drops
54
59
  parsed.filter( value => !!value.foreign.drop.length ).forEach( value => {
55
60
  if( opts.mode === "migrate" ) commands.push( ...value.foreign.drop );
package/src/parser/sys.js CHANGED
@@ -26,7 +26,7 @@ function prepareCore(opts) {
26
26
  }
27
27
  function createMigration(opts) {
28
28
  const sys = (0, escape_1.oid)(opts.sys);
29
- const migration = (0, escape_1.val)(opts.migration);
29
+ const migration = (0, escape_1.lit)(opts.migration);
30
30
  const tab = " ";
31
31
  return (0, tabs_1.noTab)([
32
32
  `insert into ${sys}.migration ( sid ) values ( ${migration} );`,
@@ -41,7 +41,7 @@ function createRevision(opts, operation) {
41
41
  const values = keys.map(value => {
42
42
  if (!operation[value])
43
43
  return `null`;
44
- return (0, escape_1.val)(operation[value]);
44
+ return (0, escape_1.lit)(operation[value]);
45
45
  }).join(", ");
46
46
  return (0, tabs_1.noTab)([
47
47
  `insert into ${sys}.revision ( ${columns} ) values ( ${values} );`,