@sqb/migrator 4.10.3 → 4.10.5

package/cjs/adapters/pg-migration-adapter.js

@@ -155,8 +155,7 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
                     script = task.script;
                 if (typeof script !== 'string')
                     return;
-                script = script
-                    .replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
+                script = this.replaceVariables(script, variables);
                 await this._connection.execute(script);
             }
             catch (e) {
@@ -180,8 +179,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             return;
         }
         if ((0, migration_package_js_1.isInsertDataMigrationTask)(task)) {
+            const tableName = this.replaceVariables(task.tableName, variables);
             const script = task.rows
-                .map(row => this.rowToSql(variables.schema + '.' + task.tableName, row))
+                .map(row => this.rowToSql(tableName, row))
                 .join('\n');
             await this._connection.execute(script);
         }

package/cjs/migration-adapter.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MigrationAdapter = void 0;
 class MigrationAdapter {
+    replaceVariables(text, variables) {
+        return text.replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
+    }
 }
 exports.MigrationAdapter = MigrationAdapter;
 (function (MigrationAdapter) {

package/esm/adapters/pg-migration-adapter.js

@@ -151,8 +151,7 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
                     script = task.script;
                 if (typeof script !== 'string')
                     return;
-                script = script
-                    .replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
+                script = this.replaceVariables(script, variables);
                 await this._connection.execute(script);
             }
             catch (e) {
@@ -176,8 +175,9 @@ CREATE TABLE IF NOT EXISTS ${adapter.eventTableFull}
             return;
         }
         if (isInsertDataMigrationTask(task)) {
+            const tableName = this.replaceVariables(task.tableName, variables);
             const script = task.rows
-                .map(row => this.rowToSql(variables.schema + '.' + task.tableName, row))
+                .map(row => this.rowToSql(tableName, row))
                 .join('\n');
             await this._connection.execute(script);
         }

package/esm/migration-adapter.js

@@ -1,4 +1,7 @@
 export class MigrationAdapter {
+    replaceVariables(text, variables) {
+        return text.replace(/(\$\((\w+)\))/g, (s, ...args) => variables[args[1]] || s);
+    }
 }
 (function (MigrationAdapter) {
     let EventKind;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sqb/migrator",
   "description": "Database migrator for SQB",
-  "version": "4.10.3",
+  "version": "4.10.5",
   "author": "Panates",
   "contributors": [
     "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -36,9 +36,9 @@
     "ts-gems": "^2.5.0"
   },
   "peerDependencies": {
-    "@sqb/builder": "^4.10.3",
-    "@sqb/connect": "^4.10.3",
-    "@sqb/postgres": "^4.10.3"
+    "@sqb/builder": "^4.10.5",
+    "@sqb/connect": "^4.10.5",
+    "@sqb/postgres": "^4.10.5"
   },
   "engines": {
     "node": ">=16.0",

package/types/migration-adapter.d.ts

@@ -16,6 +16,7 @@ export declare abstract class MigrationAdapter {
     abstract unlockSchema(): Promise<void>;
     abstract backupDatabase(): Promise<void>;
     abstract restoreDatabase(): Promise<void>;
+    protected replaceVariables(text: string, variables: Record<string, string>): string;
 }
 export declare namespace MigrationAdapter {
     enum EventKind {