rake-db 2.3.6 → 2.3.8

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { singleQuote, quote, isRaw, getRaw, toArray, columnTypes, raw, getColumnTypes, getTableData, resetTableData, ColumnType, emptyObject, TransactionAdapter, logParamToLogObject, Adapter, columnsByType, instantiateColumn, codeToString, addCode, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, TimestampColumn } from 'pqb';
+import { singleQuote, quote, isRaw, getRaw, toArray, columnTypes, raw, getColumnTypes, getTableData, resetTableData, ColumnType, emptyObject, TransactionAdapter, logParamToLogObject, createDb as createDb$1, Adapter, columnsByType, instantiateColumn, codeToString, addCode, quoteObjectKey, primaryKeyToCode, indexToCode, foreignKeyToCode, TimestampColumn } from 'pqb';
 import Enquirer from 'enquirer';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
@@ -427,7 +427,7 @@ const createTable$1 = async (migration, up, tableName, options, fn) => {
   validatePrimaryKey(ast);
   const queries = astToQueries$1(ast);
   for (const query of queries) {
-    await migration.query(query);
+    await migration.adapter.query(query);
   }
   await runCodeUpdater(migration, ast);
 };
@@ -661,7 +661,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   const ast = makeAst(up, tableName, changeData, changeTableData, options);
   const queries = astToQueries(ast);
   for (const query of queries) {
-    await migration.query(query);
+    await migration.adapter.query(query);
   }
   await runCodeUpdater(migration, ast);
 };
@@ -890,21 +890,31 @@ var __spreadValues$2 = (a, b) => {
   return a;
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
-class Migration extends TransactionAdapter {
-  constructor(tx, up, options, adapterOptions, appCodeUpdaterCache) {
-    super(tx, tx.client, tx.types);
-    this.up = up;
-    this.options = options;
-    this.adapterOptions = adapterOptions;
-    this.appCodeUpdaterCache = appCodeUpdaterCache;
-    this.log = logParamToLogObject(options.logger || console, options.log);
-  }
-  async query(query, types = this.types, log = this.log) {
-    return wrapWithLog(log, query, () => super.query(query, types));
-  }
-  async arrays(query, types = this.types, log = this.log) {
-    return wrapWithLog(log, query, () => super.arrays(query, types));
-  }
+const createMigrationInterface = (tx, up, options, adapterOptions, appCodeUpdaterCache) => {
+  const adapter = new TransactionAdapter(tx, tx.client, tx.types);
+  const { query, arrays } = adapter;
+  const log = logParamToLogObject(options.logger || console, options.log);
+  adapter.query = (q, types) => {
+    return wrapWithLog(log, q, () => query.call(adapter, q, types));
+  };
+  adapter.arrays = (q, types) => {
+    return wrapWithLog(log, q, () => arrays.call(adapter, q, types));
+  };
+  const db = createDb$1({ adapter, columnTypes });
+  const { prototype: proto } = MigrationBase;
+  for (const key of Object.getOwnPropertyNames(proto)) {
+    db[key] = proto[key];
+  }
+  return Object.assign(db, {
+    adapter,
+    log,
+    up,
+    options,
+    adapterOptions,
+    appCodeUpdaterCache
+  });
+};
+class MigrationBase {
   createTable(tableName, cbOrOptions, cb) {
     const options = typeof cbOrOptions === "function" ? {} : cbOrOptions;
     const fn = cb || cbOrOptions;
@@ -929,7 +939,7 @@ class Migration extends TransactionAdapter {
       toSchema,
       to: t
     };
-    await this.query(
+    await this.adapter.query(
       `ALTER TABLE ${quoteWithSchema({
         schema: ast.fromSchema,
         name: ast.from
@@ -1052,7 +1062,7 @@ const createSchema$1 = async (migration, up, name) => {
     action: up ? "create" : "drop",
     name
   };
-  await migration.query(
+  await migration.adapter.query(
     `${ast.action === "create" ? "CREATE" : "DROP"} SCHEMA "${name}"`
   );
   await runCodeUpdater(migration, ast);
@@ -1069,11 +1079,11 @@ const createExtension = async (migration, up, name, options) => {
   } else {
     query = `CREATE EXTENSION${ast.ifExists ? " IF NOT EXISTS" : ""} "${ast.name}"${ast.schema ? ` SCHEMA "${ast.schema}"` : ""}${ast.version ? ` VERSION '${ast.version}'` : ""}${ast.cascade ? " CASCADE" : ""}`;
   }
-  await migration.query(query);
+  await migration.adapter.query(query);
   await runCodeUpdater(migration, ast);
 };
 const queryExists = (db, sql) => {
-  return db.query(sql).then(({ rowCount }) => rowCount > 0);
+  return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
 const runCodeUpdater = (migration, ast) => {
   var _a, _b;
@@ -1140,7 +1150,13 @@ const migrateOrRollback = async (options, config, args, up) => {
 const changeCache = {};
 const processMigration = async (db, up, file, config, options, appCodeUpdaterCache) => {
   await db.transaction(async (tx) => {
-    const db2 = new Migration(tx, up, config, options, appCodeUpdaterCache);
+    const db2 = createMigrationInterface(
+      tx,
+      up,
+      config,
+      options,
+      appCodeUpdaterCache
+    );
     setCurrentMigration(db2);
     setCurrentMigrationUp(up);
     const callback = changeCache[file.path];
@@ -1152,7 +1168,7 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
     }
     await getCurrentPromise();
     await (up ? saveMigratedVersion : removeMigratedVersion)(
-      db2,
+      db2.adapter,
       file.version,
       config
     );
@@ -1941,5 +1957,5 @@ Generate arguments:
 `
 );
 
-export { Migration, change, createDb, dropDb, generate, migrate, rakeDb, resetDb, rollback, runCodeUpdater, writeMigrationFile };
+export { MigrationBase, change, createDb, createMigrationInterface, dropDb, generate, migrate, rakeDb, resetDb, rollback, runCodeUpdater, writeMigrationFile };
 //# sourceMappingURL=index.mjs.map