rake-db 2.4.43 → 2.4.44

package/dist/index.js

@@ -1749,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" }),
@@ -1787,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();
 };
@@ -2000,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'
@@ -2062,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
@@ -2417,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
     });
   }
@@ -2426,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
     });
   }
@@ -2434,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,
@@ -2467,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
     }));
   }
@@ -2484,7 +2493,6 @@ const getData = async (db) => {
     schemas,
     tables,
     views,
-    columns,
     constraints,
     indexes,
     extensions,
@@ -2494,7 +2502,6 @@ const getData = async (db) => {
     db.getSchemas(),
     db.getTables(),
     db.getViews(),
-    db.getColumns(),
     db.getConstraints(),
     db.getIndexes(),
     db.getExtensions(),
@@ -2505,7 +2512,6 @@ const getData = async (db) => {
     schemas,
     tables,
     views,
-    columns,
     constraints,
     indexes,
     extensions,
@@ -2573,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)
@@ -2594,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],
@@ -2640,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,
@@ -2679,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;
@@ -2687,7 +2692,7 @@ const constraintToAst = (item) => {
     const options = {};
     result.references = {
       columns: references.columns,
-      fnOrTable: getReferencesTable(references),
+      fnOrTable: getReferencesTable(ctx, references),
       foreignColumns: references.foreignColumns,
       options
     };
@@ -2712,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;
@@ -2739,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),
@@ -3015,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();