rake-db 2.22.7 → 2.22.9

package/dist/index.d.ts

@@ -1551,7 +1551,7 @@ declare namespace DbStructure {
         name: string;
         typeSchema: string;
         type: string;
-        isArray: boolean;
+        arrayDims: number;
         maxChars?: number;
         numericPrecision?: number;
         numericScale?: number;
@@ -1644,7 +1644,7 @@ declare namespace DbStructure {
         name: string;
         type: string;
         typeSchema: string;
-        isArray: boolean;
+        arrayDims: number;
         isNullable: boolean;
         maxChars?: number;
         numericPrecision?: number;

package/dist/index.js

@@ -1212,7 +1212,7 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     for (let i = 0; i < indexesLen; i++) {
       const fromIndex = (_v = from.indexes) == null ? void 0 : _v[i];
       const toIndex = (_w = to.indexes) == null ? void 0 : _w[i];
-      if ((fromIndex || toIndex) && (!fromIndex || !toIndex || fromIndex.options.collate !== toIndex.options.collate || fromIndex.options.opclass !== toIndex.options.opclass || fromIndex.options.order !== toIndex.options.order || fromIndex.name !== toIndex.name || fromIndex.options.unique !== toIndex.options.unique || fromIndex.options.using !== toIndex.options.using || fromIndex.options.include !== toIndex.options.include || Array.isArray(fromIndex.options.include) && Array.isArray(toIndex.options.include) && fromIndex.options.include.join(",") !== toIndex.options.include.join(",") || fromIndex.options.with !== toIndex.options.with || fromIndex.options.tablespace !== toIndex.options.tablespace || fromIndex.options.where !== toIndex.options.where || fromIndex.options.dropMode !== toIndex.options.dropMode)) {
+      if ((fromIndex || toIndex) && (!fromIndex || !toIndex || !orchidCore.deepCompare(fromIndex, toIndex))) {
         if (fromIndex) {
           dropIndexes.push(__spreadProps$5(__spreadValues$7({}, fromIndex), {
             columns: [
@@ -3663,25 +3663,13 @@ const columnsSql = ({
   ${schema}.nspname AS "schemaName",
   ${table}.relname AS "tableName",
   a.attname AS "name",
-  COALESCE(et.typname, t.typname) AS "type",
+  t.typname AS "type",
   tn.nspname AS "typeSchema",
-  et.typname IS NOT NULL AS "isArray",
-  information_schema._pg_char_max_length(
-    information_schema._pg_truetypid(a, t),
-    information_schema._pg_truetypmod(a, t)
-  ) AS "maxChars",
-  information_schema._pg_numeric_precision(
-    information_schema._pg_truetypid(a, t),
-    information_schema._pg_truetypmod(a, t)
-  ) AS "numericPrecision",
-  information_schema._pg_numeric_scale(
-    information_schema._pg_truetypid(a, t),
-    information_schema._pg_truetypmod(a, t)
-  ) AS "numericScale",
-  information_schema._pg_datetime_precision(
-    information_schema._pg_truetypid(a, t),
-    information_schema._pg_truetypmod(a, t)
-  ) AS "dateTimePrecision",
+  a.attndims AS "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",
+  information_schema._pg_datetime_precision(tt.id,tt.mod) "dateTimePrecision",
   CAST(
     CASE WHEN a.attgenerated = ''
       THEN pg_get_expr(ad.adbin, ad.adrelid)
@@ -3704,7 +3692,7 @@ const columnsSql = ({
         nullif(seq.seqmin, 1),
         'max',
         nullif(seq.seqmax, (
-          CASE COALESCE(et.typname, t.typname)
+          CASE t.typname
             WHEN 'int2' THEN 32767
             WHEN 'int4' THEN 2147483647
             WHEN 'int8' THEN 9223372036854775807
@@ -3721,8 +3709,18 @@ const columnsSql = ({
 FROM pg_attribute a
 ${join}
 LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
-JOIN pg_type t ON a.atttypid = t.oid
-LEFT JOIN pg_type et ON t.typelem = et.oid
+JOIN pg_type t
+  ON t.oid = (
+    CASE WHEN a.attndims = 0
+      THEN a.atttypid
+      ELSE (SELECT t.typelem FROM pg_type t WHERE t.oid = a.atttypid)
+    END
+  )
+JOIN LATERAL (
+  SELECT
+    CASE WHEN t.typtype = 'd' THEN t.typbasetype ELSE t.oid END id,
+    CASE WHEN t.typtype = 'd' THEN t.typtypmod ELSE a.atttypmod END mod
+) tt ON true
 JOIN pg_namespace tn ON tn.oid = t.typnamespace
 LEFT JOIN (pg_collation co JOIN pg_namespace nco ON (co.collnamespace = nco.oid))
   ON a.attcollation = co.oid AND (nco.nspname, co.collname) <> ('pg_catalog', 'default')
@@ -3981,7 +3979,7 @@ const domainsSql = `SELECT
   t.typname AS "type",
   s.nspname AS "typeSchema",
   NOT d.typnotnull AS "isNullable",
-  d.typcategory = 'A' AS "isArray",
+  d.typndims AS "arrayDims",
   character_maximum_length AS "maxChars",
   numeric_precision AS "numericPrecision",
   numeric_scale AS "numericScale",
@@ -4247,7 +4245,7 @@ const makeDomainsMap = (ctx, data) => {
       name: it.name,
       type: it.type,
       typeSchema: it.typeSchema,
-      isArray: it.isArray,
+      arrayDims: it.arrayDims,
       tableName: "",
       isNullable: it.isNullable,
       collate: it.collate,
@@ -4310,11 +4308,19 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
     }
   }
   column.data.name = void 0;
-  return dbColumn.isArray ? new pqb.ArrayColumn(
-    ctx.columnSchemaConfig,
-    column,
-    ctx.columnSchemaConfig.type
-  ) : column;
+  if (!column.data.isNullable)
+    column.data.isNullable = void 0;
+  if (dbColumn.arrayDims) {
+    const arr = new pqb.ArrayColumn(
+      ctx.columnSchemaConfig,
+      column,
+      ctx.columnSchemaConfig.type
+    );
+    arr.data.isNullable = dbColumn.isNullable;
+    arr.data.arrayDims = dbColumn.arrayDims;
+    column = arr;
+  }
+  return column;
 };
 const instantiateColumnByDbType = (ctx, type, isSerial, params) => {
   const columnFn = ctx.columnsByType[!isSerial ? type : type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial"];
@@ -4978,11 +4984,17 @@ const astEncoders = {
       ast.shape.createdAt,
       ast.shape.updatedAt
     );
+    const toCodeCtx = {
+      t: "t",
+      table: ast.name,
+      migration: true,
+      snakeCase: config.snakeCase
+    };
     for (const key in ast.shape) {
       if (timestamps.hasAnyTimestamps && (key === "createdAt" || key === "updatedAt"))
         continue;
       const line = [`${orchidCore.quoteObjectKey(key)}: `];
-      const columnCode = orchidCore.columnToCode(key, ast.shape[key], config.snakeCase);
+      const columnCode = ast.shape[key].toCode(toCodeCtx, key);
       for (const part of columnCode) {
         orchidCore.addCode(line, part);
       }
@@ -5032,6 +5044,12 @@ const astEncoders = {
         );
       }
     );
+    const toCodeCtx = {
+      t: "t",
+      table: ast.name,
+      migration: true,
+      snakeCase: config.snakeCase
+    };
     for (const key in ast.shape) {
       const changes = orchidCore.toArray(ast.shape[key]);
       for (const change of changes) {
@@ -5044,7 +5062,7 @@ const astEncoders = {
               (_a = change.item.data.name) != null ? _a : key
             )})` : `${orchidCore.quoteObjectKey(key)}: t.${change.type}(`
           ];
-          const columnCode = orchidCore.columnToCode(key, change.item, config.snakeCase);
+          const columnCode = change.item.toCode(toCodeCtx, key);
           for (let i = 0; i < columnCode.length; i++) {
             let part = columnCode[i];
             if (recreate && !i)
@@ -5059,16 +5077,20 @@ const astEncoders = {
           const line = [
             `${orchidCore.quoteObjectKey(key)}: t${change.name ? `.name(${orchidCore.singleQuote(change.name)})` : ""}.change(`
           ];
-          const fromCode = orchidCore.columnToCode(
-            key,
-            change.from.column,
-            config.snakeCase
+          const fromCode = change.from.column.toCode(
+            {
+              t: "t",
+              table: ast.name,
+              migration: true,
+              snakeCase: config.snakeCase
+            },
+            key
           );
           for (const part of fromCode) {
             orchidCore.addCode(line, part);
           }
           orchidCore.addCode(line, ", ");
-          const toCode = orchidCore.columnToCode(key, change.to.column, config.snakeCase);
+          const toCode = change.to.column.toCode(toCodeCtx, key);
           for (const part of toCode) {
             orchidCore.addCode(line, part);
           }
@@ -5192,9 +5214,13 @@ const astEncoders = {
     )}, [${ast.fromValues.map(orchidCore.singleQuote).join(", ")}], [${ast.toValues.map(orchidCore.singleQuote).join(", ")}]);`;
   },
   domain(ast) {
+    var _a;
     return `await db.${ast.action}Domain(${quoteSchemaTable(
       ast
-    )}, (t) => ${ast.baseType.toCode("t")});`;
+    )}, (t) => ${ast.baseType.toCode(
+      { t: "t", table: ast.name },
+      (_a = ast.baseType.data.name) != null ? _a : ""
+    )});`;
   },
   collation(ast) {
     const params = [];