rake-db 2.4.42 → 2.4.44

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { ColumnsShape, Db as Db$1, ColumnType, EnumColumn, ColumnTypes, Adapter, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
 import { EmptyObject, RawExpression, ColumnTypesBase, raw, MaybeArray } from 'orchid-core';
 
-declare type CreateTableResult<Table extends string, Shape extends ColumnsShape> = {
+type CreateTableResult<Table extends string, Shape extends ColumnsShape> = {
     table: Db$1<Table, Shape>;
 };
 
@@ -12,12 +12,12 @@ declare function add(this: ColumnTypesBase, emptyObject: EmptyObject): EmptyObje
 declare function add(this: ColumnTypesBase, items: Record<string, ColumnType>, options?: {
     dropMode?: DropMode;
 }): Record<string, RakeDbAst.ChangeTableItem.Column>;
-declare type Change = RakeDbAst.ChangeTableItem.Change & ChangeOptions;
-declare type ChangeOptions = {
+type Change = RakeDbAst.ChangeTableItem.Change & ChangeOptions;
+type ChangeOptions = {
     usingUp?: RawExpression;
     usingDown?: RawExpression;
 };
-declare type TableChangeMethods = typeof tableChangeMethods;
+type TableChangeMethods = typeof tableChangeMethods;
 declare const tableChangeMethods: {
     add: typeof add;
     drop: typeof add;
@@ -29,43 +29,43 @@ declare const tableChangeMethods: {
     rename(name: string): RakeDbAst.ChangeTableItem.Rename;
     enum(this: ColumnTypesBase, name: string): EnumColumn<string, [string, ...string[]]>;
 };
-declare type TableChanger = MigrationColumnTypes & TableChangeMethods;
-declare type TableChangeData = Record<string, RakeDbAst.ChangeTableItem.Column | RakeDbAst.ChangeTableItem.Rename | Change | EmptyObject>;
+type TableChanger = MigrationColumnTypes & TableChangeMethods;
+type TableChangeData = Record<string, RakeDbAst.ChangeTableItem.Column | RakeDbAst.ChangeTableItem.Rename | Change | EmptyObject>;
 
-declare type DropMode = 'CASCADE' | 'RESTRICT';
-declare type TableOptions = {
+type DropMode = 'CASCADE' | 'RESTRICT';
+type TableOptions = {
     dropMode?: DropMode;
     comment?: string;
     noPrimaryKey?: boolean;
     snakeCase?: boolean;
 };
-declare type TextColumnCreator = () => TextColumn;
-declare type MigrationColumnTypes = Omit<ColumnTypes, 'text' | 'string' | 'enum'> & {
+type TextColumnCreator = () => TextColumn;
+type MigrationColumnTypes = Omit<ColumnTypes, 'text' | 'string' | 'enum'> & {
     text: TextColumnCreator;
     string: TextColumnCreator;
     citext: TextColumnCreator;
     enum: (name: string) => EnumColumn;
 };
-declare type ColumnsShapeCallback<Shape extends ColumnsShape = ColumnsShape> = (t: MigrationColumnTypes & {
+type ColumnsShapeCallback<Shape extends ColumnsShape = ColumnsShape> = (t: MigrationColumnTypes & {
     raw: typeof raw;
 }) => Shape;
-declare type ChangeTableOptions = {
+type ChangeTableOptions = {
     snakeCase?: boolean;
     comment?: string | [string, string] | null;
 };
-declare type ChangeTableCallback = (t: TableChanger) => TableChangeData;
-declare type ColumnComment = {
+type ChangeTableCallback = (t: TableChanger) => TableChangeData;
+type ColumnComment = {
     column: string;
     comment: string | null;
 };
-declare type SilentQueries = {
+type SilentQueries = {
     silentQuery: Adapter['query'];
     silentArrays: Adapter['arrays'];
 };
-declare type Migration = DbResult<DefaultColumnTypes> & MigrationBase & {
+type Migration = DbResult<DefaultColumnTypes> & MigrationBase & {
     adapter: SilentQueries;
 };
-declare type ConstraintArg = {
+type ConstraintArg = {
     name?: string;
     references?: [
         columns: [string, ...string[]],
@@ -124,7 +124,7 @@ declare class MigrationBase {
     constraintExists(constraintName: string): Promise<boolean>;
 }
 
-declare type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameTable | RakeDbAst.Schema | RakeDbAst.Extension | RakeDbAst.Enum | RakeDbAst.Domain | RakeDbAst.Constraint | RakeDbAst.View;
+type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameTable | RakeDbAst.Schema | RakeDbAst.Extension | RakeDbAst.Enum | RakeDbAst.Domain | RakeDbAst.Constraint | RakeDbAst.View;
 declare namespace RakeDbAst {
     type Table = {
         type: 'table';
@@ -258,8 +258,8 @@ declare namespace RakeDbAst {
     };
 }
 
-declare type Db = DbResult<DefaultColumnTypes>;
-declare type RakeDbConfig = {
+type Db = DbResult<DefaultColumnTypes>;
+type RakeDbConfig = {
     basePath: string;
     migrationsPath: string;
     migrationsTable: string;
@@ -274,7 +274,7 @@ declare type RakeDbConfig = {
     beforeRollback?(db: Db): Promise<void>;
     afterRollback?(db: Db): Promise<void>;
 } & QueryLogOptions;
-declare type AppCodeUpdater = (params: {
+type AppCodeUpdater = (params: {
     ast: RakeDbAst;
     options: AdapterOptions;
     basePath: string;
@@ -290,7 +290,7 @@ declare const writeMigrationFile: (config: RakeDbConfig, version: string, name:
 declare const generate: (config: RakeDbConfig, args: string[]) => Promise<void>;
 declare const makeFileTimeStamp: () => string;
 
-declare type ChangeCallback = (db: Migration, up: boolean) => Promise<void>;
+type ChangeCallback = (db: Migration, up: boolean) => Promise<void>;
 declare const change: (fn: ChangeCallback) => void;
 
 declare const migrateOrRollback: (options: MaybeArray<AdapterOptions>, config: RakeDbConfig, args: string[], up: boolean) => Promise<void>;

package/dist/index.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var pqb = require('pqb');
 var orchidCore = require('orchid-core');
 var path = require('path');
@@ -9,10 +7,7 @@ var promises = require('fs/promises');
 var prompts = require('prompts');
 var url = require('url');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
+function _interopNamespaceDefault(e) {
   var n = Object.create(null);
   if (e) {
     Object.keys(e).forEach(function (k) {
@@ -25,13 +20,11 @@ function _interopNamespace(e) {
       }
     });
   }
-  n["default"] = e;
+  n.default = e;
   return Object.freeze(n);
 }
 
-var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
-var prompts__default = /*#__PURE__*/_interopDefaultLegacy(prompts);
-var url__namespace = /*#__PURE__*/_interopNamespace(url);
+var url__namespace = /*#__PURE__*/_interopNamespaceDefault(url);
 
 var __defProp$6 = Object.defineProperty;
 var __defProps$5 = Object.defineProperties;
@@ -53,11 +46,11 @@ var __spreadValues$6 = (a, b) => {
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const migrationConfigDefaults = {
-  migrationsPath: path__default["default"].join("src", "db", "migrations"),
+  migrationsPath: path.join("src", "db", "migrations"),
   migrationsTable: "schemaMigrations",
   snakeCase: false,
   commands: {},
-  import: (path2) => (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path2),
+  import: (path2) => import(path2),
   log: true,
   logger: console,
   useCodeUpdater: true
@@ -76,10 +69,10 @@ const processRakeDbConfig = (config) => {
     Error.prepareStackTrace = original;
     if (stack) {
       const thisFile = (_a = stack[0]) == null ? void 0 : _a.getFileName();
-      const thisDir = thisFile && path__default["default"].dirname(thisFile);
+      const thisDir = thisFile && path.dirname(thisFile);
       for (const item of stack) {
         let file = item.getFileName();
-        if (!file || path__default["default"].dirname(file) === thisDir || /\bnode_modules\b/.test(file)) {
+        if (!file || path.dirname(file) === thisDir || /\bnode_modules\b/.test(file)) {
           continue;
         }
         if (/file:\/\/\/\w+:\//.test(file)) {
@@ -90,7 +83,7 @@ const processRakeDbConfig = (config) => {
           } catch (_) {
           }
         }
-        result.basePath = path__default["default"].dirname(file);
+        result.basePath = path.dirname(file);
         break;
       }
     }
@@ -100,8 +93,8 @@ const processRakeDbConfig = (config) => {
       );
     }
   }
-  if (!path__default["default"].isAbsolute(result.migrationsPath)) {
-    result.migrationsPath = path__default["default"].resolve(
+  if (!path.isAbsolute(result.migrationsPath)) {
+    result.migrationsPath = path.resolve(
       result.basePath,
       result.migrationsPath
     );
@@ -140,7 +133,7 @@ const setAdapterOptions = (options, set) => {
   }
 };
 const setAdminCredentialsToOptions = async (options, create) => {
-  const confirm = await prompts__default["default"]([
+  const confirm = await prompts([
     {
       message: `Would you like to share admin credentials to ${create ? "create" : "drop"} a database`,
       type: "confirm",
@@ -151,7 +144,7 @@ const setAdminCredentialsToOptions = async (options, create) => {
   if (!confirm.confirm) {
     return;
   }
-  const values = await prompts__default["default"]([
+  const values = await prompts([
     {
       message: "Enter admin user:",
       type: "text",
@@ -235,7 +228,7 @@ const getMigrationFiles = async (config, up) => {
       );
     }
     return {
-      path: path__default["default"].resolve(migrationsPath, file),
+      path: path.resolve(migrationsPath, file),
       version: timestampMatch[1]
     };
   });
@@ -1756,7 +1749,7 @@ const execute = async (options, sql) => {
   }
 };
 const createOrDrop = async (options, adminOptions, config, args) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const params = getDatabaseAndUserFromOptions(options);
   const result = await execute(
     setAdapterOptions(adminOptions, { database: "postgres" }),
@@ -1794,6 +1787,21 @@ Don't use this command for database service providers, only for a local db.`;
   if (!args.create)
     return;
   const db = new pqb.Adapter(options);
+  const { schema } = db;
+  if (schema) {
+    db.schema = void 0;
+    try {
+      await db.query(`CREATE SCHEMA "${schema}"`);
+      (_e = config.logger) == null ? void 0 : _e.log(`Created schema ${schema}`);
+    } catch (err) {
+      if (err.code === "42P06") {
+        (_f = config.logger) == null ? void 0 : _f.log(`Schema ${schema} already exists`);
+      } else {
+        throw err;
+      }
+    }
+    db.schema = schema;
+  }
   await createSchemaMigrations(db, config);
   await db.close();
 };
@@ -1837,7 +1845,7 @@ const resetDb = async (arg, config) => {
 const writeMigrationFile = async (config, version, name, content) => {
   var _a;
   await promises.mkdir(config.migrationsPath, { recursive: true });
-  const filePath = path__default["default"].resolve(config.migrationsPath, `${version}_${name}.ts`);
+  const filePath = path.resolve(config.migrationsPath, `${version}_${name}.ts`);
   await promises.writeFile(filePath, content);
   (_a = config.logger) == null ? void 0 : _a.log(`Created ${orchidCore.pathToLog(filePath)}`);
 };
@@ -1854,7 +1862,7 @@ const generate = async (config, args) => {
   );
 };
 const makeFileTimeStamp = () => {
-  const now = new Date();
+  const now = /* @__PURE__ */ new Date();
   return [
     now.getUTCFullYear(),
     now.getUTCMonth() + 1,
@@ -2007,7 +2015,12 @@ ORDER BY "name"`
       `SELECT
   nspname AS "schemaName",
   relname AS "name",
-  obj_description(c.oid) AS comment
+  obj_description(c.oid) AS comment,
+  (SELECT coalesce(json_agg(t), '[]') FROM (${columnsSql({
+        schema: "n",
+        table: "c",
+        where: "a.attrelid = c.oid"
+      })}) t) AS "columns"
 FROM pg_class c
 JOIN pg_catalog.pg_namespace n ON n.oid = relnamespace
 WHERE relkind = 'r'
@@ -2069,17 +2082,6 @@ WHERE ${filterSchema("n.nspname")}`
     );
     return rows;
   }
-  async getColumns() {
-    const { rows } = await this.db.query(
-      columnsSql({
-        schema: "nc",
-        table: "c",
-        join: `JOIN pg_class c ON a.attrelid = c.oid AND c.relkind = 'r' JOIN pg_namespace nc ON nc.oid = c.relnamespace`,
-        where: filterSchema("nc.nspname")
-      })
-    );
-    return rows;
-  }
   async getIndexes() {
     const { rows } = await this.db.query(
       `SELECT
@@ -2368,6 +2370,7 @@ const matchMap = {
 };
 const fkeyActionMap = {
   a: void 0,
+  // default
   r: "RESTRICT",
   c: "CASCADE",
   n: "SET NULL",
@@ -2423,7 +2426,7 @@ const structureToAst = async (ctx, db) => {
       type: "extension",
       action: "create",
       name: it.name,
-      schema: it.schemaName === "public" ? void 0 : it.schemaName,
+      schema: it.schemaName === ctx.currentSchema ? void 0 : it.schemaName,
       version: it.version
     });
   }
@@ -2432,7 +2435,7 @@ const structureToAst = async (ctx, db) => {
       type: "enum",
       action: "create",
       name: it.name,
-      schema: it.schemaName === "public" ? void 0 : it.schemaName,
+      schema: it.schemaName === ctx.currentSchema ? void 0 : it.schemaName,
       values: it.values
     });
   }
@@ -2440,7 +2443,7 @@ const structureToAst = async (ctx, db) => {
     ast.push({
       type: "domain",
       action: "create",
-      schema: it.schemaName === "public" ? void 0 : it.schemaName,
+      schema: it.schemaName === ctx.currentSchema ? void 0 : it.schemaName,
       name: it.name,
       baseType: domains[`${it.schemaName}.${it.name}`],
       notNull: it.notNull,
@@ -2473,10 +2476,10 @@ const structureToAst = async (ctx, db) => {
     );
   }
   for (const [fkey, table] of outerConstraints) {
-    ast.push(__spreadProps(__spreadValues({}, constraintToAst(fkey)), {
+    ast.push(__spreadProps(__spreadValues({}, constraintToAst(ctx, fkey)), {
       type: "constraint",
       action: "create",
-      tableSchema: table.schemaName === "public" ? void 0 : table.schemaName,
+      tableSchema: table.schemaName === ctx.currentSchema ? void 0 : table.schemaName,
       tableName: fkey.tableName
     }));
   }
@@ -2490,7 +2493,6 @@ const getData = async (db) => {
     schemas,
     tables,
     views,
-    columns,
     constraints,
     indexes,
     extensions,
@@ -2500,7 +2502,6 @@ const getData = async (db) => {
     db.getSchemas(),
     db.getTables(),
     db.getViews(),
-    db.getColumns(),
     db.getConstraints(),
     db.getIndexes(),
     db.getExtensions(),
@@ -2511,7 +2512,6 @@ const getData = async (db) => {
     schemas,
     tables,
     views,
-    columns,
     constraints,
     indexes,
     extensions,
@@ -2579,13 +2579,12 @@ const getColumnType = (type, isSerial) => {
   return type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial";
 };
 const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstraints = data.constraints) => {
-  const { schemaName, name: tableName } = table;
+  const { schemaName, name: tableName, columns } = table;
   const key = `${schemaName}.${table.name}`;
   delete pendingTables[key];
   if (tableName === "schemaMigrations")
     return;
   const belongsToTable = makeBelongsToTable(schemaName, tableName);
-  const columns = data.columns.filter(belongsToTable);
   let primaryKey;
   for (const item of data.constraints) {
     if (belongsToTable(item) && item.primaryKey)
@@ -2600,7 +2599,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
         const constraint = {
           references: references ? {
             columns: references.columns,
-            fnOrTable: getReferencesTable(references),
+            fnOrTable: getReferencesTable(ctx, references),
             foreignColumns: references.foreignColumns,
             options: {
               match: matchMap[references.match],
@@ -2646,7 +2645,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
   ast.push({
     type: "table",
     action: "create",
-    schema: schemaName === "public" ? void 0 : schemaName,
+    schema: schemaName === ctx.currentSchema ? void 0 : schemaName,
     comment: table.comment,
     name: tableName,
     shape,
@@ -2685,7 +2684,7 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
     }
   }
 };
-const constraintToAst = (item) => {
+const constraintToAst = (ctx, item) => {
   var _a;
   const result = {};
   const { references, check } = item;
@@ -2693,7 +2692,7 @@ const constraintToAst = (item) => {
     const options = {};
     result.references = {
       columns: references.columns,
-      fnOrTable: getReferencesTable(references),
+      fnOrTable: getReferencesTable(ctx, references),
       foreignColumns: references.foreignColumns,
       options
     };
@@ -2718,8 +2717,8 @@ const constraintToAst = (item) => {
   }
   return result;
 };
-const getReferencesTable = (references) => {
-  return references.foreignSchema !== "public" ? `${references.foreignSchema}.${references.foreignTable}` : references.foreignTable;
+const getReferencesTable = (ctx, references) => {
+  return references.foreignSchema !== ctx.currentSchema ? `${references.foreignSchema}.${references.foreignTable}` : references.foreignTable;
 };
 const isColumnCheck = (it) => {
   var _a, _b;
@@ -2745,7 +2744,7 @@ const viewToAst = (ctx, data, domains, view) => {
   return {
     type: "view",
     action: "create",
-    schema: view.schemaName === "public" ? void 0 : view.schemaName,
+    schema: view.schemaName === ctx.currentSchema ? void 0 : view.schemaName,
     name: view.name,
     shape,
     sql: orchidCore.raw(view.sql),
@@ -3021,10 +3020,12 @@ const createView = (ast) => {
 const pullDbStructure = async (options, config) => {
   var _a, _b, _c;
   const adapter = new pqb.Adapter(options);
+  const currentSchema = adapter.schema || "public";
   const db = new DbStructure(adapter);
   const ctx = {
     unsupportedTypes: {},
-    snakeCase: config.snakeCase
+    snakeCase: config.snakeCase,
+    currentSchema
   };
   const ast = await structureToAst(ctx, db);
   await adapter.close();