rake-db 2.22.39 → 2.22.41

package/dist/index.d.ts

@@ -1556,6 +1556,8 @@ declare namespace DbStructure {
             cache: number;
             cycle: boolean;
         };
+        extension?: string;
+        typmod: number;
     }
     interface Index {
         schemaName: string;

package/dist/index.js

@@ -3674,12 +3674,12 @@ const columnsSql = ({
   join = "",
   where
 }) => `SELECT
-  ${schema}.nspname AS "schemaName",
-  ${table}.relname AS "tableName",
-  a.attname AS "name",
-  t.typname AS "type",
-  tn.nspname AS "typeSchema",
-  a.attndims AS "arrayDims",
+  ${schema}.nspname "schemaName",
+  ${table}.relname "tableName",
+  a.attname "name",
+  t.typname "type",
+  tn.nspname "typeSchema",
+  a.attndims "arrayDims",
   information_schema._pg_char_max_length(tt.id, tt.mod) "maxChars",
   information_schema._pg_numeric_precision(tt.id, tt.mod) "numericPrecision",
   information_schema._pg_numeric_scale(tt.id,tt.mod) "numericScale",
@@ -3719,7 +3719,9 @@ const columnsSql = ({
         seq.seqcycle
       )
     ) END
-  ) "identity"
+  ) "identity",
+  ext.extname "extension",
+  a.atttypmod "typmod"
 FROM pg_attribute a
 ${join}
 LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
@@ -3743,6 +3745,8 @@ LEFT JOIN pg_catalog.pg_description pgd
  AND pgd.objsubid = a.attnum
 LEFT JOIN (pg_depend dep JOIN pg_sequence seq ON (dep.classid = 'pg_class'::regclass AND dep.objid = seq.seqrelid AND dep.deptype = 'i'))
   ON (dep.refclassid = 'pg_class'::regclass AND dep.refobjid = ${table}.oid AND dep.refobjsubid = a.attnum)
+LEFT JOIN pg_depend d ON d.objid = t.oid AND d.classid = 'pg_type'::regclass AND d.deptype = 'e'
+LEFT JOIN pg_extension ext ON ext.oid = d.refobjid
 WHERE a.attnum > 0
   AND NOT a.attisdropped
   AND ${where}
@@ -4263,7 +4267,8 @@ const makeDomainsMap = (ctx, data) => {
       tableName: "",
       isNullable: it.isNullable,
       collate: it.collate,
-      default: it.default
+      default: it.default,
+      typmod: -1
     });
     if (it.check) {
       column.data.check = {
@@ -4299,9 +4304,11 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
     const typeId = typeSchema === "pg_catalog" ? typeName : `${typeSchema}.${typeName}`;
     const domainColumn = domains[typeId];
     if (domainColumn) {
-      column = new pqb.DomainColumn(ctx.columnSchemaConfig, typeId).as(
-        domainColumn
-      );
+      column = new pqb.DomainColumn(
+        ctx.columnSchemaConfig,
+        typeId,
+        dbColumn.extension
+      ).as(domainColumn);
     } else {
       const enumType = data.enums.find(
         (x) => x.name === typeName && x.schemaName === typeSchema
@@ -4314,7 +4321,11 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
           ctx.columnSchemaConfig.type
         );
       } else {
-        column = new pqb.CustomTypeColumn(ctx.columnSchemaConfig, typeId);
+        column = new pqb.CustomTypeColumn(
+          ctx.columnSchemaConfig,
+          typeId,
+          dbColumn.extension
+        );
         ((_c = (_a = ctx.unsupportedTypes)[_b = dbColumn.type]) != null ? _c : _a[_b] = []).push(
           `${dbColumn.schemaName}${dbColumn.tableName ? `.${dbColumn.tableName}` : ""}.${dbColumn.name}`
         );
@@ -4337,7 +4348,10 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
   return column;
 };
 const instantiateColumnByDbType = (ctx, type, isSerial, params) => {
-  const columnFn = ctx.columnsByType[!isSerial ? type : type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial"];
+  let columnFn = ctx.columnsByType[!isSerial ? type : type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial"];
+  if (!columnFn && params.extension === "postgis" && type === "geography" && pqb.PostgisGeographyPointColumn.isDefaultPoint(params.typmod)) {
+    columnFn = ctx.columnsByType.geographyDefaultPoint;
+  }
   return columnFn ? pqb.instantiateColumn(columnFn, params) : void 0;
 };
 const tableToAst = (ctx, data, table, action, domains) => {