rake-db 2.4.12 → 2.4.14

package/dist/index.d.ts

@@ -40,6 +40,7 @@ declare type TextColumnCreator = () => TextColumn;
 declare type MigrationColumnTypes = Omit<ColumnTypes, 'text' | 'string' | 'enum'> & {
     text: TextColumnCreator;
     string: TextColumnCreator;
+    citext: TextColumnCreator;
     enum: (name: string) => EnumColumn;
 };
 declare type ColumnsShapeCallback = (t: MigrationColumnTypes & {

package/dist/index.js

@@ -1715,9 +1715,9 @@ WHERE ${filterSchema("n.nspname")}`
   table_schema "schemaName",
   table_name "tableName",
   column_name "name",
-  COALESCE(domain_name, udt_name) "type",
-  COALESCE(domain_schema, udt_schema) "typeSchema",
-  data_type "dataType",
+  typname "type",
+  n.nspname "typeSchema",
+  data_type = 'ARRAY' "isArray",
   character_maximum_length AS "maxChars",
   numeric_precision AS "numericPrecision",
   numeric_scale AS "numericScale",
@@ -1728,15 +1728,23 @@ WHERE ${filterSchema("n.nspname")}`
   NULLIF(a.attcompression, '') AS compression,
   pgd.description AS "comment"
 FROM information_schema.columns c
-LEFT JOIN pg_catalog.pg_statio_all_tables AS st
+JOIN pg_catalog.pg_statio_all_tables st
   ON c.table_schema = st.schemaname
  AND c.table_name = st.relname
 LEFT JOIN pg_catalog.pg_description pgd
   ON pgd.objoid = st.relid
  AND pgd.objsubid = c.ordinal_position
-LEFT JOIN pg_catalog.pg_attribute a
+JOIN pg_catalog.pg_attribute a
   ON a.attrelid = st.relid
  AND a.attnum = c.ordinal_position
+JOIN pg_catalog.pg_type t
+  ON (
+       CASE WHEN data_type = 'ARRAY'
+         THEN typarray
+         ELSE oid
+       END
+     ) = atttypid
+JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
 WHERE ${filterSchema("table_schema")}
 ORDER BY c.ordinal_position`
     );
@@ -2043,7 +2051,7 @@ const fkeyActionMap = {
   n: "SET NULL",
   d: "SET DEFAULT"
 };
-const structureToAst = async (config, db) => {
+const structureToAst = async (unsupportedTypes, db) => {
   const ast = [];
   const data = await getData(db);
   for (const name of data.schemas) {
@@ -2071,19 +2079,24 @@ const structureToAst = async (config, db) => {
   }
   const domains = {};
   for (const it of data.domains) {
-    domains[`${it.schemaName}.${it.name}`] = getColumn(config, data, domains, {
-      schemaName: it.schemaName,
-      name: it.name,
-      type: it.type,
-      typeSchema: it.typeSchema,
-      isArray: it.isArray,
-      isSerial: false
-    });
+    domains[`${it.schemaName}.${it.name}`] = getColumn(
+      unsupportedTypes,
+      data,
+      domains,
+      {
+        schemaName: it.schemaName,
+        name: it.name,
+        type: it.type,
+        typeSchema: it.typeSchema,
+        isArray: it.isArray,
+        isSerial: false
+      }
+    );
   }
   for (const key in pendingTables) {
     const { table, dependsOn } = pendingTables[key];
     if (!dependsOn.size) {
-      pushTableAst(config, ast, data, domains, table, pendingTables);
+      pushTableAst(unsupportedTypes, ast, data, domains, table, pendingTables);
     }
   }
   const outerFKeys = [];
@@ -2131,7 +2144,15 @@ const structureToAst = async (config, db) => {
         outerFKeys.push([fkey, table]);
       }
     }
-    pushTableAst(config, ast, data, domains, table, pendingTables, innerFKeys);
+    pushTableAst(
+      unsupportedTypes,
+      ast,
+      data,
+      domains,
+      table,
+      pendingTables,
+      innerFKeys
+    );
   }
   for (const [fkey, table] of outerFKeys) {
     ast.push(__spreadProps(__spreadValues({}, foreignKeyToAst(fkey)), {
@@ -2191,7 +2212,7 @@ const getIsSerial = (item) => {
   }
   return false;
 };
-const getColumn = (config, data, domains, _a) => {
+const getColumn = (unsupportedTypes, data, domains, _a) => {
   var _b = _a, {
     schemaName,
     tableName,
@@ -2226,8 +2247,8 @@ const getColumn = (config, data, domains, _a) => {
         column = new RakeDbEnumColumn({}, type, enumType.values);
       } else {
         column = new pqb.CustomTypeColumn({}, type);
-        (_a2 = config.logger) == null ? void 0 : _a2.warn(
-          `${tableName ? "Column" : "Domain"} ${schemaName}${tableName ? `.${tableName}` : ""}.${name} has unsupported type \`${type}\`, append \`as\` method manually to it to treat it as other column type`
+        ((_a2 = unsupportedTypes[type]) != null ? _a2 : unsupportedTypes[type] = []).push(
+          `${schemaName}${tableName ? `.${tableName}` : ""}.${name}`
         );
       }
     }
@@ -2239,7 +2260,7 @@ const getColumnType = (type, isSerial) => {
     return type;
   return type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial";
 };
-const pushTableAst = (config, ast, data, domains, table, pendingTables, innerFKeys = data.foreignKeys) => {
+const pushTableAst = (unsupportedTypes, ast, data, domains, table, pendingTables, innerFKeys = data.foreignKeys) => {
   const { schemaName, name } = table;
   const key = `${schemaName}.${table.name}`;
   delete pendingTables[key];
@@ -2262,10 +2283,9 @@ const pushTableAst = (config, ast, data, domains, table, pendingTables, innerFKe
     if (isSerial) {
       item = __spreadProps(__spreadValues({}, item), { default: void 0 });
     }
-    const isArray = item.dataType === "ARRAY";
-    let column = getColumn(config, data, domains, __spreadProps(__spreadValues({}, item), {
-      type: isArray ? item.type.slice(1) : item.type,
-      isArray,
+    let column = getColumn(unsupportedTypes, data, domains, __spreadProps(__spreadValues({}, item), {
+      type: item.type,
+      isArray: item.isArray,
       isSerial
     }));
     if ((primaryKey == null ? void 0 : primaryKey.columnNames.length) === 1 && (primaryKey == null ? void 0 : primaryKey.columnNames[0]) === item.name) {
@@ -2346,7 +2366,14 @@ const pushTableAst = (config, ast, data, domains, table, pendingTables, innerFKe
   for (const otherKey in pendingTables) {
     const item = pendingTables[otherKey];
     if (item.dependsOn.delete(key) && item.dependsOn.size === 0) {
-      pushTableAst(config, ast, data, domains, item.table, pendingTables);
+      pushTableAst(
+        unsupportedTypes,
+        ast,
+        data,
+        domains,
+        item.table,
+        pendingTables
+      );
     }
   }
 };
@@ -2518,10 +2545,11 @@ const createForeignKey = (item) => {
 };
 
 const pullDbStructure = async (options, config) => {
-  var _a;
+  var _a, _b, _c;
   const adapter = new pqb.Adapter(options);
   const db = new DbStructure(adapter);
-  const ast = await structureToAst(config, db);
+  const unsupportedTypes = {};
+  const ast = await structureToAst(unsupportedTypes, db);
   await adapter.close();
   const result = astToMigration(config, ast);
   if (!result)
@@ -2539,6 +2567,21 @@ const pullDbStructure = async (options, config) => {
       logger: config.logger
     }));
   }
+  const unsupportedEntries = Object.entries(unsupportedTypes);
+  const len = unsupportedEntries.length;
+  if (len) {
+    let count = 0;
+    (_b = config.logger) == null ? void 0 : _b.warn(
+      `Found unsupported types:
+${unsupportedEntries.map(([type, columns]) => {
+        count += columns.length;
+        return `${type} is used for column${columns.length > 1 ? "s" : ""} ${columns.join(", ")}`;
+      }).join("\n")}
+
+Append \`as\` method manually to ${count > 1 ? "these" : "this"} column${count > 1 ? "s" : ""} to treat ${count > 1 ? "them" : "it"} as other column type`
+    );
+  }
+  (_c = config.logger) == null ? void 0 : _c.log("Database pulled successfully");
 };
 
 const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2)) => {