@prisma-psm/pg 1.0.5 → 1.0.7

package/.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/../psm" vcs="Git" />
   </component>
 </project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma-psm/pg",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Prisma Safe Migration Postgres Driver",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -1,21 +1,30 @@
 "use strict";
-const sql_1 = require("./parser/sql");
 const parser_1 = require("./parser/parser");
 const migration_1 = require("./migration");
+const sql_1 = require("./parser/sql");
 function prepare(model) {
     if (!model.schema)
         model.schema = "public";
 }
 const driver = {
+    migrated: (opts) => {
+        return (0, migration_1.migrated)(opts);
+    },
     migrator: opts => ({
         migrate: () => (0, migration_1.migrate)({ sql: opts.migrate, url: opts.url, label: "NEXT" }),
         test: () => (0, migration_1.migrate)({ sql: opts.check, url: opts.url, label: "TEST" }),
+        core: () => (0, migration_1.migrate)({ sql: opts.core, url: opts.url, label: "CORE" }),
     }),
-    generator: opts => ({
-        migrate: () => (0, sql_1.sql)((0, parser_1.parser)(Object.assign(Object.assign({}, opts), { mode: "migrate" }))),
-        check: () => (0, sql_1.sql)((0, parser_1.parser)(Object.assign(Object.assign({}, opts), { mode: "check" }))),
-    }),
-    prepare
+    generator: (opts) => {
+        let response = (0, parser_1.parser)(opts);
+        const generator = {
+            migrate: () => (0, sql_1.sql)({ mode: "migrate" }, response),
+            check: () => (0, sql_1.sql)({ mode: "check" }, response),
+            core: () => (0, sql_1.sql)({ mode: "core" }, response)
+        };
+        return generator;
+    },
+    prepare,
 };
 module.exports = driver;
 //# sourceMappingURL=index.js.map

package/src/index.ts

@@ -1,23 +1,35 @@
-import {sql} from "./parser/sql";
-import {PSMDriver, ModelOptions} from "@prisma-psm/core";
+import {PSMDriver, ModelOptions, PSMGenerator} from "@prisma-psm/core";
 import {parser} from "./parser/parser";
-import {migrate} from "./migration";
-
+import {migrate,migrated} from "./migration";
+import {sql} from "./parser/sql";
 
 
 
 function prepare( model:ModelOptions ){
     if( !model.schema ) model.schema = "public";
 }
+
+
 const driver :PSMDriver = {
+    migrated:( opts )=>{
+        return migrated( opts );
+    },
     migrator: opts => ({
         migrate: () => migrate({ sql: opts.migrate, url: opts.url, label: "NEXT" }),
         test: () => migrate({ sql: opts.check, url: opts.url, label: "TEST" }),
+        core: () => migrate({ sql: opts.core, url: opts.url, label: "CORE" }),
     }),
-    generator: opts => ({
-        migrate: () => sql(parser({ ...opts, mode: "migrate"})),
-        check: () => sql(parser({ ...opts, mode: "check"})),
-    }),
-    prepare
-}
+
+    generator:(opts) => {
+        let response = parser(opts);
+
+        const generator: PSMGenerator = {
+            migrate: () => sql( { mode: "migrate" }, response),
+            check: () => sql( { mode: "check" }, response),
+            core: () => sql( { mode: "core" }, response)
+        }
+        return generator;
+    },
+    prepare,
+} as PSMDriver
 export = driver

package/src/migration/index.d.ts

@@ -1,3 +1,4 @@
-import { MigrationOptions, PSMMigrationResult } from "@prisma-psm/core";
+import { MigrationOptions, PSMMigrated, PSMMigratedOptions, PSMMigrationResult } from "@prisma-psm/core";
 export declare function migrate(opts: MigrationOptions): Promise<PSMMigrationResult>;
+export declare function migrated(opts: PSMMigratedOptions): Promise<PSMMigrated>;
 //# sourceMappingURL=index.d.ts.map

package/src/migration/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAItE,wBAAgB,OAAO,CAAC,IAAI,EAAC,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsC1E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAE,kBAAkB,EAAE,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;AAKvG,wBAAgB,OAAO,CAAC,IAAI,EAAC,gBAAgB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsC1E;AACD,wBAAgB,QAAQ,CAAC,IAAI,EAAC,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAwCtE"}

package/src/migration/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrate = migrate;
+exports.migrated = migrated;
 const pg_1 = require("pg");
+const escape_1 = require("../utils/escape");
 function migrate(opts) {
     return new Promise((resolve, reject) => {
         const response = {
@@ -37,4 +39,41 @@ function migrate(opts) {
         });
     });
 }
+function migrated(opts) {
+    return new Promise((resolve, reject) => {
+        const response = {
+            messages: [],
+        };
+        const client = new pg_1.Client(opts.url);
+        client.connect(err => {
+            var _a;
+            if (err) {
+                (_a = response.messages) === null || _a === void 0 ? void 0 : _a.push(`Connection failed: ${err.message}`);
+                response.error = err;
+            }
+            const sys = (0, escape_1.oid)(opts.sys || "sys");
+            const query = new pg_1.Query(`
+                select * from ${sys}.migration;
+            `);
+            query.on("error", err => {
+                var _a;
+                response.error = err;
+                (_a = response.messages) === null || _a === void 0 ? void 0 : _a.push(`Load migrated failed: ${err.message}`);
+                console.error(`Load migrated failed`, err);
+                client.end(err1 => { });
+                resolve(response);
+            });
+            query.on("end", result => {
+                response.success = true;
+                response.migrated = result.rows;
+                client.end(err1 => { });
+                resolve(response);
+            });
+            client.on("notice", notice => {
+                console.log(`PSM NOTICE: ${notice.message}`);
+            });
+            client.query(query);
+        });
+    });
+}
 //# sourceMappingURL=index.js.map

package/src/migration/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;AAIA,0BAsCC;AAzCD,2BAAkC;AAGlC,SAAgB,OAAO,CAAC,IAAqB;IACzC,OAAO,IAAI,OAAO,CAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,MAAM,QAAQ,GAAsB;YAChC,QAAQ,EAAE,EAAE;SACf,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,WAAM,CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACrC,MAAM,CAAC,OAAO,CAAE,GAAG,CAAC,EAAE;;YAClB,IAAI,GAAG,EAAG,CAAC;gBACP,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,CAAE,sBAAsB,GAAG,CAAC,OAAO,EAAE,CAAE,CAAC;gBAC/D,QAAQ,CAAC,KAAK,GAAG,GAAG,CAAC;YACzB,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,UAAK,CAAE,IAAI,CAAC,GAAG,CAAE,CAAC;YACpC,KAAK,CAAC,EAAE,CAAE,OAAO,EAAE,GAAG,CAAC,EAAE;;gBACrB,QAAQ,CAAC,KAAK,GAAG,GAAG,CAAC;gBACrB,MAAA,QAAQ,CAAC,QAAQ,0CAAE,IAAI,CAAE,GAAG,IAAI,CAAC,KAAK,sBAAsB,GAAG,CAAC,OAAO,EAAE,CAAE,CAAC;gBAC5E,OAAO,CAAC,KAAK,CAAE,GAAG,IAAI,CAAC,KAAK,mBAAmB,EAAE,GAAG,CAAC,CAAA;gBACrD,MAAM,CAAC,GAAG,CAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACzB,OAAO,CAAE,QAAQ,CAAE,CAAC;YACxB,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAE,KAAK,EAAE,MAAM,CAAC,EAAE;gBACtB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC;gBACxB,MAAM,CAAC,GAAG,CAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;gBACzB,OAAO,CAAE,QAAQ,CAAE,CAAC;YACxB,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAE,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAEjC,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAE,QAAQ,EAAE,MAAM,CAAC,EAAE;gBAC1B,OAAO,CAAC,GAAG,CAAE,eAAe,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,KAAK,CAAE,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAA;AACN,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/src/migration/index.ts

@@ -1,5 +1,6 @@
-import {MigrationOptions, PSMMigrationResult} from "@prisma-psm/core";
+import {MigrationOptions, PSMMigrated, PSMMigratedOptions, PSMMigrationResult} from "@prisma-psm/core";
 import { Client, Query } from 'pg'
+import {oid} from "../utils/escape";
 
 
 export function migrate(opts:MigrationOptions ):Promise<PSMMigrationResult>{
@@ -37,6 +38,47 @@ export function migrate(opts:MigrationOptions ):Promise<PSMMigrationResult>{
                 console.log( `PSM NOTICE: ${notice.message}`);
             });
 
+            client.query( query);
+        });
+    })
+}
+export function migrated(opts:PSMMigratedOptions ):Promise<PSMMigrated>{
+    return new Promise( (resolve, reject) => {
+        const response:PSMMigrated = {
+            messages: [],
+        }
+        const client = new Client( opts.url);
+        client.connect( err => {
+            if( err ) {
+                response.messages?.push( `Connection failed: ${err.message}` );
+                response.error = err;
+            }
+
+            const sys = oid( opts.sys || "sys" )
+
+            const query = new Query( `
+                select * from ${sys}.migration;
+            `);
+
+            query.on( "error", err => {
+                response.error = err;
+                response.messages?.push( `Load migrated failed: ${err.message}` );
+                console.error( `Load migrated failed`, err)
+                client.end( err1 => { });
+                resolve( response );
+            });
+
+            query.on( "end", result => {
+                response.success = true;
+                response.migrated = result.rows;
+                client.end( err1 => { });
+                resolve( response );
+            });
+
+            client.on( "notice", notice => {
+                console.log( `PSM NOTICE: ${notice.message}`);
+            });
+
             client.query( query);
         });
     })

package/src/parser/backup/engine.d.ts

@@ -6,7 +6,10 @@ export interface RestoreOptions {
     model: ModelOptions;
     parser: PostgresParserOptions;
 }
-export declare function restoreBackupSQL(opts: RestoreOptions): string[];
+export declare function restoreBackupSQL(opts: RestoreOptions): {
+    data: string[];
+    registry: string[];
+};
 export interface RestoreSerialOptions extends RestoreOptions {
     from: string;
     to: string;

package/src/parser/backup/engine.d.ts.map

@@ -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,MAAM,EAAE,CAyH/D;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"}
+{"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"}

package/src/parser/backup/engine.js

@@ -5,9 +5,9 @@ exports.restoreBackupSQL = restoreBackupSQL;
 exports.restoreSerialSQL = restoreSerialSQL;
 const escape_1 = require("../../utils/escape");
 const tabs_1 = require("../../utils/tabs");
+const notice_1 = require("../notice");
 const sys_1 = require("../sys");
 const sha_1 = require("../../utils/sha");
-const notice_1 = require("../notice");
 function createFunctionRestoreSerial(opts) {
     const sys = (0, escape_1.oid)(opts.sys);
     const tab = "         ";
@@ -46,7 +46,7 @@ function createFunctionRestoreSerial(opts) {
     ], tab);
 }
 function restoreBackupSQL(opts) {
-    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;
+    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;
     const schema = (0, escape_1.oid)(opts.model.schema);
     const source = (0, escape_1.oid)(opts.source);
     const shadow = (0, escape_1.oid)(opts.parser.shadow);
@@ -61,12 +61,16 @@ function restoreBackupSQL(opts) {
     const columns = opts.model.fields.filter(filter)
         .map(value => ` ${(0, escape_1.oid)(value.name)}`)
         .join(", ");
+    const DEFAULT_WHEN = `true`;
     const DEFAULT_QUERY = `select * from ${schema}.${source}`;
+    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)}`;
     const DEFAULT_RESOLVER = opts.model.fields.filter(filter)
         .map(value => {
         return ` ${(0, escape_1.oid)(value.dbName || value.name)}`;
     })
         .join(", ");
+    let source_exists = DEFAULT_SOURCE_CHECKER;
+    let when = DEFAULT_WHEN;
     const revision_resolver = opts.model.fields.filter(filter)
         .map(field => {
         var _a, _b;
@@ -78,14 +82,18 @@ function restoreBackupSQL(opts) {
         .join(", ");
     let revision_query = DEFAULT_QUERY;
     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;
-    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"
+    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;
+    if (!!(exists === null || exists === void 0 ? void 0 : exists.length)) {
+        source_exists = exists;
+    }
+    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"
         && !!expression)
         revision_query = expression;
-    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"
+    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"
         && !!expression
-        && !!((_o = (_m = opts.model.psm) === null || _m === void 0 ? void 0 : _m.query) === null || _o === void 0 ? void 0 : _o[expression]))
-        revision_query = (_q = (_p = opts.model.psm) === null || _p === void 0 ? void 0 : _p.query) === null || _q === void 0 ? void 0 : _q[expression];
-    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) {
+        && !!((_r = (_q = opts.model.psm) === null || _q === void 0 ? void 0 : _q.query) === null || _r === void 0 ? void 0 : _r[expression]))
+        revision_query = (_t = (_s = opts.model.psm) === null || _s === void 0 ? void 0 : _s.query) === null || _t === void 0 ? void 0 : _t[expression];
+    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) {
         let model = opts.parser.models.find(value => value.model === expression);
         if (!!model)
             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) {
     const sys = (0, escape_1.oid)(opts.parser.sys);
     let revision = "null";
     const relation = `${schema}.${table}`;
-    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)
-        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);
+    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)
+        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);
     let always_query = DEFAULT_QUERY;
     let always_resolver = DEFAULT_RESOLVER;
-    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) {
+    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) {
         always_query = revision_query;
         always_resolver = revision_resolver;
         revision = `always-${opts.parser.migration}`;
@@ -106,8 +114,18 @@ function restoreBackupSQL(opts) {
       do $$
         declare
           _revision character varying := ${revision}::character varying;
-          _relation character varying := ${(0, escape_1.val)(relation)}::character varying;
+          _relation character varying := ${(0, escape_1.lit)(relation)}::character varying;
+          ___whenX1025475 boolean;
         begin
+          if not exists( ${source_exists} ) then
+            return;
+          end if;
+          
+          ___whenX1025475 := (${when});
+          if not coalesce( ___whenX1025475, true ) then
+            return;
+          end if;
+          
           if _revision is not null and not exists(
             select 1
               from ${sys}.revision r
@@ -131,13 +149,6 @@ function restoreBackupSQL(opts) {
           else 
             raise exception 'cannot restore revision';
           end if;
-          
-          ${(0, sys_1.createRevision)(opts.parser, {
-        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,
-        relation: relation,
-        hash: (0, sha_1.migrationHash)(opts.parser.migration, `restore:data-${relation}`),
-        operation: `restore:data-${relation}`
-    }).join("\n")}
         end;
       $$;
     `.split("\n")
@@ -148,24 +159,33 @@ function restoreBackupSQL(opts) {
         return value;
     })
         .join("\n");
-    return [
-        (0, notice_1.notice)(`CREATE BACKUP FOR MODEL ${opts.model.model}`),
-        next,
-        (0, notice_1.notice)(`CREATE BACKUP FOR MODEL ${opts.model.model} OK`),
-    ];
+    return {
+        data: [
+            (0, notice_1.notice)(`RESTORE BACKUP FOR MODEL ${opts.model.model}`),
+            next,
+            (0, notice_1.notice)(`RESTORE BACKUP FOR MODEL ${opts.model.model} OK`),
+        ],
+        registry: [
+            (0, notice_1.notice)(`REGISTRY RESTORE OF BACKUP FOR MODEL ${opts.model.model}`),
+            (0, sys_1.createRevision)(opts.parser, {
+                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,
+                relation: relation,
+                hash: (0, sha_1.migrationHash)(opts.parser.migration, `restore:data-${relation}`),
+                operation: `restore:data-${relation}`
+            }).join("\n"),
+            (0, notice_1.notice)(`REGISTRY RESTORE OF BACKUP FOR MODEL ${opts.model.model} OK`),
+        ],
+    };
 }
 function restoreSerialSQL(opts) {
-    let seq = "null";
-    if (!!opts.seq)
-        seq = (0, escape_1.val)(opts.seq);
     const args = [
-        ` schema := ${(0, escape_1.val)(opts.model.schema)}::character varying`,
-        ` source := ${(0, escape_1.val)(opts.source)}::character varying`,
-        ` shadow := ${(0, escape_1.val)(opts.parser.shadow)}::character varying`,
-        ` temp := ${(0, escape_1.val)(opts.model.temp)}::character varying`,
-        ` "from" := ${(0, escape_1.val)(opts.from)}::character varying`,
-        ` "to" := ${(0, escape_1.val)(opts.to)}::character varying`,
-        ` "seq" := ${seq}::character varying`,
+        ` schema := ${(0, escape_1.lit)(opts.model.schema, escape_1.VARCHAR)}`,
+        ` source := ${(0, escape_1.lit)(opts.source, escape_1.VARCHAR)}`,
+        ` shadow := ${(0, escape_1.lit)(opts.parser.shadow, escape_1.VARCHAR)}`,
+        ` temp := ${(0, escape_1.lit)(opts.model.temp, escape_1.VARCHAR)}`,
+        ` "from" := ${(0, escape_1.lit)(opts.from, escape_1.VARCHAR)}`,
+        ` "to" := ${(0, escape_1.lit)(opts.to, escape_1.VARCHAR)}`,
+        ` "seq" := ${(0, escape_1.lit)(opts.seq, escape_1.VARCHAR)}`,
     ];
     return [
         (0, notice_1.notice)(`RESTORE SEQUENCE OF FIELD ${opts.to} FROM MODEL ${opts.model.model}`),

package/src/parser/backup/engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engine.js","sourceRoot":"","sources":["engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engine.js","sourceRoot":"","sources":["engine.ts"],"names":[],"mappings":"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"}

package/src/parser/backup/engine.ts

@@ -1,10 +1,10 @@
 import {FieldOption, ModelOptions} from "@prisma-psm/core";
-import {oid, val} from "../../utils/escape";
+import {oid, lit, VARCHAR} from "../../utils/escape";
 import { noTab } from "../../utils/tabs";
 import { PostgresParserOptions } from "../def";
+import {notice} from "../notice";
 import {createRevision} from "../sys";
 import {migrationHash} from "../../utils/sha";
-import {notice} from "../notice";
 
 export function createFunctionRestoreSerial( opts: PostgresParserOptions) {
     const sys = oid( opts.sys);
@@ -51,15 +51,15 @@ export interface RestoreOptions{
     parser:PostgresParserOptions
 }
 
-export function restoreBackupSQL(opts:RestoreOptions ): string[] {
+export function restoreBackupSQL(opts:RestoreOptions ): {
+    data:string[]
+    registry:string[]
+}{
     const schema =  oid(opts.model.schema);
     const source =  oid(opts.source);
     const shadow =  oid(opts.parser.shadow);
-    const table =   oid(opts.model.name);
-    const temp =    oid(opts.model.temp);
-
-
-
+    const table  =  oid(opts.model.name);
+    const temp   =  oid(opts.model.temp);
 
     if( opts.model.psm?.backup?.skip ) return null as any;
 
@@ -69,12 +69,15 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
             ;
     }
 
+
     const columns = opts.model.fields.filter( filter  )
         .map( value => ` ${oid(value.name)}` )
         .join(", ")
     ;
 
+    const DEFAULT_WHEN = `true`;
     const DEFAULT_QUERY = `select * from ${schema}.${source}`;
+    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)}`;
     const DEFAULT_RESOLVER = opts.model.fields.filter( filter )
         .map( value => {
             return  ` ${oid(value.dbName||value.name)}`;
@@ -82,6 +85,9 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
         .join(", ")
     ;
 
+    let source_exists = DEFAULT_SOURCE_CHECKER;
+    let when = DEFAULT_WHEN;
+
     const revision_resolver = opts.model.fields.filter( filter )
         .map( field => {
 
@@ -94,9 +100,15 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
 
     let revision_query = DEFAULT_QUERY;
     const expression = opts.model.psm?.backup?.rev?.expression;
+    const exists = opts.model.psm?.backup?.rev?.exists;
+
+    if( !!exists?.length ){
+        source_exists = exists;
+    }
+
     if( opts.model.psm?.backup?.rev?.from === "query"
         && !!expression
-    ) revision_query = expression
+    ) revision_query = expression;
 
     else if( opts.model.psm?.backup?.rev?.from === "query:linked"
         && !!expression
@@ -111,7 +123,7 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
     const sys = oid( opts.parser.sys );
     let revision= "null";
     const relation = `${schema}.${table}`;
-    if( opts.model.psm?.backup?.rev?.version )  revision = val( opts.model.psm?.backup?.rev.version );
+    if( opts.model.psm?.backup?.rev?.version )  revision = lit( opts.model.psm?.backup?.rev.version );
 
     let always_query = DEFAULT_QUERY;
     let always_resolver = DEFAULT_RESOLVER;
@@ -121,12 +133,22 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
         revision = `always-${opts.parser.migration}`;
     }
 
-    const next =  `
+    const next =`
       do $$
         declare
           _revision character varying := ${revision}::character varying;
-          _relation character varying := ${val(relation)}::character varying;
+          _relation character varying := ${lit(relation)}::character varying;
+          ___whenX1025475 boolean;
         begin
+          if not exists( ${source_exists} ) then
+            return;
+          end if;
+          
+          ___whenX1025475 := (${when});
+          if not coalesce( ___whenX1025475, true ) then
+            return;
+          end if;
+          
           if _revision is not null and not exists(
             select 1
               from ${sys}.revision r
@@ -150,13 +172,6 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
           else 
             raise exception 'cannot restore revision';
           end if;
-          
-          ${ createRevision( opts.parser, {
-        revision: opts.model.psm?.backup?.rev?.version,
-        relation: relation,
-        hash: migrationHash( opts.parser.migration, `restore:data-${relation}`),
-        operation: `restore:data-${relation}`
-    }).join("\n")}
         end;
       $$;
     `.split("\n")
@@ -167,11 +182,23 @@ export function restoreBackupSQL(opts:RestoreOptions ): string[] {
         })
         .join("\n");
 
-    return [
-        notice( `CREATE BACKUP FOR MODEL ${opts.model.model}` ),
-        next,
-        notice( `CREATE BACKUP FOR MODEL ${opts.model.model} OK` ),
-    ]
+    return {
+        data: [
+            notice( `RESTORE BACKUP FOR MODEL ${opts.model.model}` ),
+            next,
+            notice( `RESTORE BACKUP FOR MODEL ${opts.model.model} OK` ),
+        ],
+        registry: [
+            notice( `REGISTRY RESTORE OF BACKUP FOR MODEL ${opts.model.model}` ),
+            createRevision( opts.parser, {
+                revision: opts.model.psm?.backup?.rev?.version,
+                relation: relation,
+                hash: migrationHash( opts.parser.migration, `restore:data-${relation}`),
+                operation: `restore:data-${relation}`
+            }).join("\n"),
+            notice( `REGISTRY RESTORE OF BACKUP FOR MODEL ${opts.model.model} OK` ),
+        ],
+    }
 }
 
 export interface RestoreSerialOptions extends RestoreOptions {
@@ -180,16 +207,14 @@ export interface RestoreSerialOptions extends RestoreOptions {
     seq?:string
 }
 export function restoreSerialSQL( opts:RestoreSerialOptions) {
-    let seq = "null";
-    if( !!opts.seq ) seq = val( opts.seq );
     const args = [
-        ` schema := ${val(opts.model.schema)}::character varying`,
-        ` source := ${val(opts.source)}::character varying`,
-        ` shadow := ${val(opts.parser.shadow)}::character varying`,
-        ` temp := ${val(opts.model.temp)}::character varying`,
-        ` "from" := ${val(opts.from)}::character varying`,
-        ` "to" := ${val(opts.to)}::character varying`,
-        ` "seq" := ${seq}::character varying`,
+        ` schema := ${lit(opts.model.schema, VARCHAR)}`,
+        ` source := ${lit(opts.source, VARCHAR)}`,
+        ` shadow := ${lit(opts.parser.shadow, VARCHAR)}`,
+        ` temp := ${lit(opts.model.temp, VARCHAR)}`,
+        ` "from" := ${lit(opts.from, VARCHAR)}`,
+        ` "to" := ${lit(opts.to, VARCHAR)}`,
+        ` "seq" := ${lit( opts.seq, VARCHAR)}`,
     ];
     return [
         notice( `RESTORE SEQUENCE OF FIELD ${opts.to} FROM MODEL ${opts.model.model}`),

package/src/parser/backup/index.d.ts

@@ -1,7 +1,10 @@
 import { ModelOptions } from "@prisma-psm/core";
 import { PostgresParserOptions } from "../def";
 export declare function backupParser(model: ModelOptions, parser: PostgresParserOptions): {
-    restore_backup: () => string[];
+    restore_backup: () => {
+        data: string[];
+        registry: string[];
+    };
     restore_serial: () => string[];
 };
 //# sourceMappingURL=index.d.ts.map

package/src/parser/backup/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,qBAAqB,EAAC,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAE,KAAK,EAAC,YAAY,EAAE,MAAM,EAAC,qBAAqB;;;EAwB7E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAC,qBAAqB,EAAC,MAAM,QAAQ,CAAC;AAI7C,wBAAgB,YAAY,CAAE,KAAK,EAAC,YAAY,EAAE,MAAM,EAAC,qBAAqB;;;;;;EAwB7E"}