rake-db 2.14.2 → 2.14.3

package/dist/index.js

@@ -2674,23 +2674,7 @@ JOIN pg_class c
 JOIN pg_rewrite r ON r.ev_class = c.oid
 WHERE ${filterSchema("nc.nspname")}
 ORDER BY c.relname`;
-const sql = `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
-  tablesSql,
-  "tables"
-)}, ${jsonAgg(viewsSql, "views")}`;
-class DbStructure {
-  constructor(db) {
-    this.db = db;
-  }
-  async getStructure() {
-    const {
-      rows: [structure]
-    } = await this.db.query(sql);
-    return structure;
-  }
-  async getIndexes() {
-    const { rows } = await this.db.query(
-      `SELECT
+const indexesSql = `SELECT
   n.nspname "schemaName",
   t.relname "tableName",
   ic.relname "name",
@@ -2785,13 +2769,8 @@ JOIN pg_am am ON am.oid = ic.relam
 LEFT JOIN pg_catalog.pg_class tc ON (ic.reltoastrelid = tc.oid)
 WHERE ${filterSchema("n.nspname")}
   AND NOT i.indisprimary
-ORDER BY ic.relname`
-    );
-    return rows;
-  }
-  async getConstraints() {
-    const { rows } = await this.db.query(
-      `SELECT
+ORDER BY ic.relname`;
+const constraintsSql = `SELECT
   s.nspname AS "schemaName",
   t.relname AS "tableName",
   c.conname AS "name",
@@ -2857,13 +2836,8 @@ JOIN pg_catalog.pg_namespace s
   ON s.oid = t.relnamespace
  AND contype IN ('p', 'f', 'c')
  AND ${filterSchema("s.nspname")}
-ORDER BY c.conname`
-    );
-    return rows;
-  }
-  async getTriggers() {
-    const { rows } = await this.db.query(
-      `SELECT event_object_schema AS "schemaName",
+ORDER BY c.conname`;
+const triggersSql = `SELECT event_object_schema AS "schemaName",
   event_object_table AS "tableName",
   trigger_schema AS "triggerSchema",
   trigger_name AS name,
@@ -2874,25 +2848,15 @@ ORDER BY c.conname`
 FROM information_schema.triggers
 WHERE ${filterSchema("event_object_schema")}
 GROUP BY event_object_schema, event_object_table, trigger_schema, trigger_name, action_timing, action_condition, action_statement
-ORDER BY trigger_name`
-    );
-    return rows;
-  }
-  async getExtensions() {
-    const { rows } = await this.db.query(
-      `SELECT
+ORDER BY trigger_name`;
+const extensionsSql = `SELECT
   nspname AS "schemaName",
   extname AS "name",
   extversion AS version
 FROM pg_extension
 JOIN pg_catalog.pg_namespace n ON n.oid = extnamespace
- AND ${filterSchema("n.nspname")}`
-    );
-    return rows;
-  }
-  async getEnums() {
-    const { rows } = await this.db.query(
-      `SELECT
+ AND ${filterSchema("n.nspname")}`;
+const enumsSql = `SELECT
   n.nspname as "schemaName",
   t.typname as name,
   json_agg(e.enumlabel) as values
@@ -2900,12 +2864,8 @@ FROM pg_type t
 JOIN pg_enum e ON t.oid = e.enumtypid
 JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
 WHERE ${filterSchema("n.nspname")}
-GROUP BY n.nspname, t.typname`
-    );
-    return rows;
-  }
-  async getDomains() {
-    const { rows } = await this.db.query(`SELECT
+GROUP BY n.nspname, t.typname`;
+const domainsSql = `SELECT
   n.nspname AS "schemaName",
   d.typname AS "name",
   t.typname AS "type",
@@ -2933,11 +2893,8 @@ JOIN pg_catalog.pg_type t
   ) = d.typbasetype
 JOIN pg_catalog.pg_namespace s ON s.oid = t.typnamespace
 LEFT JOIN pg_catalog.pg_constraint c ON c.contypid = d.oid
-WHERE d.typtype = 'd' AND ${filterSchema("n.nspname")}`);
-    return rows;
-  }
-  async getCollations() {
-    const { rows } = await this.db.query(`SELECT
+WHERE d.typtype = 'd' AND ${filterSchema("n.nspname")}`;
+const collationsSql = `SELECT
   nspname "schema",
   collname "name",
   CASE WHEN collprovider = 'i' THEN 'icu' WHEN collprovider = 'c' THEN 'libc' ELSE collprovider::text END "provider",
@@ -2948,10 +2905,23 @@ WHERE d.typtype = 'd' AND ${filterSchema("n.nspname")}`);
   collversion "version"
 FROM pg_collation
 JOIN pg_namespace n on pg_collation.collnamespace = n.oid
-WHERE ${filterSchema("n.nspname")}
-    `);
-    return rows;
-  }
+WHERE ${filterSchema("n.nspname")}`;
+const sql = `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
+  tablesSql,
+  "tables"
+)}, ${jsonAgg(viewsSql, "views")}, ${jsonAgg(indexesSql, "indexes")}, ${jsonAgg(
+  constraintsSql,
+  "constraints"
+)}, ${jsonAgg(triggersSql, "triggers")}, ${jsonAgg(
+  extensionsSql,
+  "extensions"
+)}, ${jsonAgg(enumsSql, "enums")}, ${jsonAgg(domainsSql, "domains")}, ${jsonAgg(
+  collationsSql,
+  "collations"
+)}`;
+async function introspectDbSchema(db) {
+  const data = await db.query(sql);
+  return data.rows[0];
 }
 
 var __defProp$1 = Object.defineProperty;
@@ -2998,9 +2968,9 @@ const fkeyActionMap = {
   n: "SET NULL",
   d: "SET DEFAULT"
 };
-const structureToAst = async (ctx, db) => {
+const structureToAst = async (ctx, adapter) => {
   const ast = [];
-  const data = await getData(db);
+  const data = await introspectDbSchema(adapter);
   for (const name of data.schemas) {
     if (name === "public")
       continue;
@@ -3118,36 +3088,6 @@ const structureToAst = async (ctx, db) => {
   }
   return ast;
 };
-const getData = async (db) => {
-  const [
-    { schemas, tables, views },
-    constraints,
-    indexes,
-    extensions,
-    enums,
-    domains,
-    collations
-  ] = await Promise.all([
-    db.getStructure(),
-    db.getConstraints(),
-    db.getIndexes(),
-    db.getExtensions(),
-    db.getEnums(),
-    db.getDomains(),
-    db.getCollations()
-  ]);
-  return {
-    schemas,
-    tables,
-    views,
-    constraints,
-    indexes,
-    extensions,
-    enums,
-    domains,
-    collations
-  };
-};
 const makeBelongsToTable = (schema, table) => (item) => item.schemaName === schema && item.tableName === table;
 const getIsSerial = (item) => {
   if (item.type === "int2" || item.type === "int4" || item.type === "int8") {
@@ -3707,7 +3647,6 @@ const pullDbStructure = async (options, config) => {
   var _a, _b, _c, _d;
   const adapter = new pqb.Adapter(options);
   const currentSchema = adapter.schema || "public";
-  const db = new DbStructure(adapter);
   const ctx = {
     snakeCase: config.snakeCase,
     unsupportedTypes: {},
@@ -3715,7 +3654,7 @@ const pullDbStructure = async (options, config) => {
     columnSchemaConfig: config.schemaConfig,
     columnsByType: pqb.makeColumnsByType(config.schemaConfig)
   };
-  const ast = await structureToAst(ctx, db);
+  const ast = await structureToAst(ctx, adapter);
   await adapter.close();
   const result = astToMigration(config, ast);
   if (!result)