rake-db 2.25.9 → 2.25.11

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)) {
@@ -2483,11 +2484,15 @@ const recreateEnum = async (migration, { schema, name }, values, errorMessage) =
   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
     )}
@@ -2496,7 +2501,9 @@ 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}`,
@@ -2506,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;
       }
@@ -4240,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 {
@@ -4257,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(
@@ -4941,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");
@@ -4975,13 +4987,14 @@ const astEncoders = {
     const toCodeCtx = {
       t: "t",
       table: ast.name,
+      currentSchema,
       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 line = [`${orchidCore.quoteObjectKey(key, config.snakeCase)}: `];
       const columnCode = ast.shape[key].toCode(toCodeCtx, key);
       for (const part of columnCode) {
         orchidCore.addCode(line, part);
@@ -5030,6 +5043,7 @@ const astEncoders = {
     const toCodeCtx = {
       t: "t",
       table: ast.name,
+      currentSchema,
       migration: true,
       snakeCase: config.snakeCase
     };
@@ -5043,7 +5057,7 @@ const astEncoders = {
           const line = [
             recreate ? `...t.${change.type}(t.name(${orchidCore.singleQuote(
               change.item.data.name ?? key
-            )})` : `${orchidCore.quoteObjectKey(key)}: t.${change.type}(`
+            )})` : `${orchidCore.quoteObjectKey(key, config.snakeCase)}: t.${change.type}(`
           ];
           const columnCode = change.item.toCode(toCodeCtx, key);
           for (let i = 0; i < columnCode.length; i++) {
@@ -5056,12 +5070,13 @@ const astEncoders = {
         } else if (change.type === "change") {
           if (!change.from.column || !change.to.column) continue;
           const line = [
-            `${orchidCore.quoteObjectKey(key)}: t${change.name ? `.name(${orchidCore.singleQuote(change.name)})` : ""}.change(`
+            `${orchidCore.quoteObjectKey(key, config.snakeCase)}: t${change.name ? `.name(${orchidCore.singleQuote(change.name)})` : ""}.change(`
           ];
           const fromCode = change.from.column.toCode(
             {
               t: "t",
               table: ast.name,
+              currentSchema,
               migration: true,
               snakeCase: config.snakeCase
             },
@@ -5091,7 +5106,9 @@ const astEncoders = {
           code.push(line);
         } else if (change.type === "rename") {
           code.push([
-            `${orchidCore.quoteObjectKey(key)}: t.rename(${orchidCore.singleQuote(change.name)}),`
+            `${orchidCore.quoteObjectKey(key, config.snakeCase)}: t.rename(${orchidCore.singleQuote(
+              change.name
+            )}),`
           ]);
         } else {
           exhaustive(change.type);
@@ -5188,21 +5205,23 @@ const astEncoders = {
       ast
     )}, [${ast.values.map(orchidCore.singleQuote).join(", ")}]);`;
   },
-  renameEnumValues(ast) {
+  renameEnumValues(ast, config) {
     return `await db.renameEnumValues(${quoteSchemaTable(
       ast
-    )}, { ${Object.entries(ast.values).map(([from, to]) => `${orchidCore.quoteObjectKey(from)}: ${orchidCore.singleQuote(to)}`).join(", ")} });`;
+    )}, { ${Object.entries(ast.values).map(
+      ([from, to]) => `${orchidCore.quoteObjectKey(from, config.snakeCase)}: ${orchidCore.singleQuote(to)}`
+    ).join(", ")} });`;
   },
   changeEnumValues(ast) {
     return `await db.changeEnumValues(${quoteSchemaTable(
       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 ?? ""
     )});`;
   },