rake-db 2.25.8 → 2.25.10

package/dist/index.js

@@ -162,7 +162,7 @@ const encodeColumnDefault = (def, values, column) => {
       return def.toSQL({ values });
     } else {
       return pqb.escapeForMigration(
-        column?.data.encode ? column.data.encode(def) : def
+        column instanceof pqb.ArrayColumn && Array.isArray(def) ? "{" + (column.data.item.data.encode ? def.map((x) => column.data.item.data.encode(x)) : def).join(",") + "}" : column?.data.encode ? column.data.encode(def) : def
       );
     }
   }
@@ -1179,8 +1179,9 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
     if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
       changeType = true;
       const type = !to.column || to.column.data.isOfCustomType ? to.column && to.column instanceof pqb.DomainColumn ? quoteNameFromString(to.type) : quoteCustomType(to.type) : to.type;
+      const using = item.using?.usingUp ? ` USING ${item.using.usingUp.toSQL({ values })}` : to.column instanceof pqb.EnumColumn ? ` USING "${name}"::text::${type}` : to.column instanceof pqb.ArrayColumn ? ` USING "${name}"::text[]::${type}` : "";
       alterTable.push(
-        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${item.using?.usingUp ? ` USING ${item.using.usingUp.toSQL({ values })}` : to.column instanceof pqb.EnumColumn ? ` USING "${name}"::text::${type}` : ""}`
+        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(to.collate)}` : ""}${using}`
       );
     }
     if (typeof from.identity !== typeof to.identity || !orchidCore.deepCompare(from.identity, to.identity)) {
@@ -2479,22 +2480,30 @@ const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
 const recreateEnum = async (migration, { schema, name }, values, errorMessage) => {
   const defaultSchema = migration.adapter.schema;
   const quotedName = quoteTable(schema, name);
+  const relKinds = ["r", "m"];
   const { rows: tables } = await migration.adapter.query(
     `SELECT n.nspname AS "schema",
   c.relname AS "table",
-  json_agg(a.attname ORDER BY a.attnum) AS "columns"
+  json_agg(
+    json_build_object('name', a.attname, 'arrayDims', a.attndims)
+    ORDER BY a.attnum
+  ) AS "columns"
 FROM pg_class c
 JOIN pg_catalog.pg_namespace n ON n.oid = relnamespace
-JOIN pg_attribute a ON a.attrelid = c.oid
-JOIN pg_type t ON a.atttypid = t.oid AND t.typname = ${orchidCore.singleQuote(name)}
+JOIN pg_type bt ON bt.typname = ${orchidCore.singleQuote(name)}
+JOIN pg_type t ON t.oid = bt.oid OR t.typelem = bt.oid
+JOIN pg_attribute a ON a.attrelid = c.oid AND a.atttypid = t.oid
 JOIN pg_namespace tn ON tn.oid = t.typnamespace AND tn.nspname = ${orchidCore.singleQuote(
       schema ?? defaultSchema
     )}
+WHERE c.relkind IN (${relKinds.map((c) => `'${c}'`).join(", ")})
 GROUP BY n.nspname, c.relname`
   );
   const sql = tables.map(
     (t) => `ALTER TABLE ${quoteTable(t.schema, t.table)}
-        ${t.columns.map((c) => `  ALTER COLUMN "${c}" TYPE text`).join(",\n")}`
+        ${t.columns.map(
+      (c) => `  ALTER COLUMN "${c.name}" TYPE text${"[]".repeat(c.arrayDims)}`
+    ).join(",\n")}`
   );
   sql.push(
     `DROP TYPE ${quotedName}`,
@@ -2504,14 +2513,17 @@ GROUP BY n.nspname, c.relname`
   for (const t of tables) {
     const table = quoteTable(t.schema, t.table);
     for (const c of t.columns) {
+      const type = quotedName + "[]".repeat(c.arrayDims);
       try {
         await migration.adapter.query(
           `ALTER TABLE ${table}
-  ALTER COLUMN "${c}" TYPE ${quotedName} USING "${c}"::${quotedName}`
+  ALTER COLUMN "${c.name}" TYPE ${type} USING "${c.name}"::${type}`
         );
       } catch (err) {
         if (err.code === "22P02") {
-          throw new Error(errorMessage(quotedName, table, c), { cause: err });
+          throw new Error(errorMessage(quotedName, table, c.name), {
+            cause: err
+          });
         }
         throw err;
       }
@@ -4238,7 +4250,8 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
     if (domainColumn) {
       column = new pqb.DomainColumn(
         ctx.columnSchemaConfig,
-        typeId,
+        typeName,
+        typeSchema,
         dbColumn.extension
       ).as(domainColumn);
     } else {
@@ -4255,7 +4268,8 @@ const instantiateDbColumn = (ctx, data, domains, dbColumn) => {
       } else {
         column = new pqb.CustomTypeColumn(
           ctx.columnSchemaConfig,
-          typeId,
+          typeName,
+          typeSchema === "pg_catalog" ? void 0 : typeSchema,
           dbColumn.extension
         );
         ((_a = ctx.unsupportedTypes)[_b = dbColumn.type] ?? (_a[_b] = [])).push(
@@ -4852,14 +4866,16 @@ const astToMigration = (currentSchema, config, asts) => {
       const item = items[i];
       let satisfied = true;
       for (const dep of item.deps) {
-        if (toBeAdded.has(dep) && !added.has(dep)) {
+        if (toBeAdded.has(dep) && !added.has(dep) && !item.add.has(dep)) {
           satisfied = false;
           break;
         }
       }
       if (satisfied) {
-        for (const key of item.drop) {
-          if (remainingDeps.has(key)) {
+        for (const dep of item.drop) {
+          const selfRef = item.deps.has(dep);
+          const depsLeft = remainingDeps.get(dep);
+          if (depsLeft && depsLeft > (selfRef ? 1 : 0)) {
             satisfied = false;
             break;
           }
@@ -4937,7 +4953,7 @@ ${group.map(
   return code;
 };
 const astEncoders = {
-  table(ast, config) {
+  table(ast, config, currentSchema) {
     let code = [];
     const result = code;
     const hasOptions = Boolean(ast.comment || ast.noPrimaryKey === "ignore");
@@ -4971,6 +4987,7 @@ const astEncoders = {
     const toCodeCtx = {
       t: "t",
       table: ast.name,
+      currentSchema,
       migration: true,
       snakeCase: config.snakeCase
     };
@@ -5026,6 +5043,7 @@ const astEncoders = {
     const toCodeCtx = {
       t: "t",
       table: ast.name,
+      currentSchema,
       migration: true,
       snakeCase: config.snakeCase
     };
@@ -5058,6 +5076,7 @@ const astEncoders = {
             {
               t: "t",
               table: ast.name,
+              currentSchema,
               migration: true,
               snakeCase: config.snakeCase
             },
@@ -5194,11 +5213,11 @@ const astEncoders = {
       ast
     )}, [${ast.fromValues.map(orchidCore.singleQuote).join(", ")}], [${ast.toValues.map(orchidCore.singleQuote).join(", ")}]);`;
   },
-  domain(ast) {
+  domain(ast, _, currentSchema) {
     return `await db.${ast.action}Domain(${quoteSchemaTable(
       ast
     )}, (t) => ${ast.baseType.toCode(
-      { t: "t", table: ast.name },
+      { t: "t", table: ast.name, currentSchema },
       ast.baseType.data.name ?? ""
     )});`;
   },