rake-db 2.4.9 → 2.4.11

package/dist/index.js

@@ -1967,7 +1967,7 @@ ORDER BY c.conname`);
   d.typname AS "name",
   t.typname AS "type",
   s.nspname AS "typeSchema",
-  .typnotnull AS "notNull",
+  d.typnotnull AS "notNull",
   d.typcategory = 'A' AS "isArray",
   character_maximum_length AS "maxChars",
   numeric_precision AS "numericPrecision",
@@ -2043,7 +2043,7 @@ const fkeyActionMap = {
   n: "SET NULL",
   d: "SET DEFAULT"
 };
-const structureToAst = async (db) => {
+const structureToAst = async (config, db) => {
   const ast = [];
   const data = await getData(db);
   for (const name of data.schemas) {
@@ -2071,7 +2071,7 @@ const structureToAst = async (db) => {
   }
   const domains = {};
   for (const it of data.domains) {
-    domains[`${it.schemaName}.${it.name}`] = getColumn(data, domains, {
+    domains[`${it.schemaName}.${it.name}`] = getColumn(config, data, domains, {
       schemaName: it.schemaName,
       name: it.name,
       type: it.type,
@@ -2083,7 +2083,7 @@ const structureToAst = async (db) => {
   for (const key in pendingTables) {
     const { table, dependsOn } = pendingTables[key];
     if (!dependsOn.size) {
-      pushTableAst(ast, data, domains, table, pendingTables);
+      pushTableAst(config, ast, data, domains, table, pendingTables);
     }
   }
   const outerFKeys = [];
@@ -2131,7 +2131,7 @@ const structureToAst = async (db) => {
         outerFKeys.push([fkey, table]);
       }
     }
-    pushTableAst(ast, data, domains, table, pendingTables, innerFKeys);
+    pushTableAst(config, ast, data, domains, table, pendingTables, innerFKeys);
   }
   for (const [fkey, table] of outerFKeys) {
     ast.push(__spreadProps(__spreadValues({}, foreignKeyToAst(fkey)), {
@@ -2191,7 +2191,7 @@ const getIsSerial = (item) => {
   }
   return false;
 };
-const getColumn = (data, domains, _a) => {
+const getColumn = (config, data, domains, _a) => {
   var _b = _a, {
     schemaName,
     tableName,
@@ -2209,6 +2209,7 @@ const getColumn = (data, domains, _a) => {
     "isArray",
     "isSerial"
   ]);
+  var _a2;
   let column;
   const klass = pqb.columnsByType[getColumnType(type, isSerial)];
   if (klass) {
@@ -2221,12 +2222,14 @@ const getColumn = (data, domains, _a) => {
       const enumType = data.enums.find(
         (item) => item.name === type && item.schemaName === typeSchema
       );
-      if (!enumType) {
-        throw new Error(
-          `Cannot handle ${tableName ? "column" : "domain"} ${schemaName}${tableName ? `.${tableName}` : ""}.${name}: column type \`${type}\` is not supported`
+      if (enumType) {
+        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`
         );
       }
-      column = new RakeDbEnumColumn({}, type, enumType.values);
     }
   }
   return isArray ? new pqb.ArrayColumn({}, column) : column;
@@ -2236,7 +2239,7 @@ const getColumnType = (type, isSerial) => {
     return type;
   return type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial";
 };
-const pushTableAst = (ast, data, domains, table, pendingTables, innerFKeys = data.foreignKeys) => {
+const pushTableAst = (config, ast, data, domains, table, pendingTables, innerFKeys = data.foreignKeys) => {
   const { schemaName, name } = table;
   const key = `${schemaName}.${table.name}`;
   delete pendingTables[key];
@@ -2260,7 +2263,7 @@ const pushTableAst = (ast, data, domains, table, pendingTables, innerFKeys = dat
       item = __spreadProps(__spreadValues({}, item), { default: void 0 });
     }
     const isArray = item.dataType === "ARRAY";
-    let column = getColumn(data, domains, __spreadProps(__spreadValues({}, item), {
+    let column = getColumn(config, data, domains, __spreadProps(__spreadValues({}, item), {
       type: isArray ? item.type.slice(1) : item.type,
       isArray,
       isSerial
@@ -2343,7 +2346,7 @@ const pushTableAst = (ast, data, domains, table, pendingTables, innerFKeys = dat
   for (const otherKey in pendingTables) {
     const item = pendingTables[otherKey];
     if (item.dependsOn.delete(key) && item.dependsOn.size === 0) {
-      pushTableAst(ast, data, domains, item.table, pendingTables);
+      pushTableAst(config, ast, data, domains, item.table, pendingTables);
     }
   }
 };
@@ -2518,7 +2521,7 @@ const pullDbStructure = async (options, config) => {
   var _a;
   const adapter = new pqb.Adapter(options);
   const db = new DbStructure(adapter);
-  const ast = await structureToAst(db);
+  const ast = await structureToAst(config, db);
   await adapter.close();
   const result = astToMigration(config, ast);
   if (!result)