orchid-orm 1.50.3 → 1.50.5

package/dist/migrations.js

@@ -443,43 +443,14 @@ const changeColumns = async (adapter, config, structureToAstCtx, dbStructure, do
   }
 };
 const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSql, changeTableData, typeCastsCache, verifying, key, dbName, dbColumn, codeColumn) => {
-  const dbType = getColumnDbType(dbColumn, currentSchema);
-  const codeType = getColumnDbType(codeColumn, currentSchema);
   if (dbColumn instanceof pqb.ArrayColumn && codeColumn instanceof pqb.ArrayColumn) {
     dbColumn = dbColumn.data.item;
     codeColumn = codeColumn.data.item;
   }
+  const dbType = getColumnDbType(dbColumn, currentSchema);
+  const codeType = getColumnDbType(codeColumn, currentSchema);
   if (dbType !== codeType) {
-    let typeCasts = typeCastsCache.value;
-    if (!typeCasts) {
-      const { rows } = await adapter.arrays(`SELECT s.typname, t.typname
-FROM pg_cast
-JOIN pg_type AS s ON s.oid = castsource
-JOIN pg_type AS t ON t.oid = casttarget`);
-      const directTypeCasts = /* @__PURE__ */ new Map();
-      for (const [source, target] of rows) {
-        const set = directTypeCasts.get(source);
-        if (set) {
-          set.add(target);
-        } else {
-          directTypeCasts.set(source, /* @__PURE__ */ new Set([target]));
-        }
-      }
-      typeCasts = /* @__PURE__ */ new Map();
-      for (const [type, directSet] of directTypeCasts.entries()) {
-        const set = new Set(directSet);
-        typeCasts.set(type, set);
-        for (const subtype of directSet) {
-          const subset = directTypeCasts.get(subtype);
-          if (subset) {
-            for (const type2 of subset) {
-              set.add(type2);
-            }
-          }
-        }
-      }
-      typeCastsCache.value = typeCasts;
-    }
+    const typeCasts = await getTypeCasts(adapter, typeCastsCache);
     const dbBaseType = pqb.getColumnBaseType(dbColumn, domainsMap, dbType);
     const codeBaseType = pqb.getColumnBaseType(codeColumn, domainsMap, codeType);
     if (!typeCasts.get(dbBaseType)?.has(codeBaseType)) {
@@ -525,6 +496,15 @@ JOIN pg_type AS t ON t.oid = casttarget`);
       return "change";
     }
   }
+  if (dbColumn.data.isOfCustomType) {
+    const { typmod } = dbColumn.data;
+    if (typmod !== void 0 && typmod !== -1) {
+      const i = codeColumn.dataType.indexOf("(");
+      if (i === -1 || codeColumn.dataType.slice(i + 1, -1) !== `${typmod}`) {
+        return "change";
+      }
+    }
+  }
   if (!orchidCore.deepCompare(
     dbData.identity,
     codeData.identity ? {
@@ -571,6 +551,39 @@ JOIN pg_type AS t ON t.oid = casttarget`);
   }
   return;
 };
+const getTypeCasts = async (adapter, typeCastsCache) => {
+  let typeCasts = typeCastsCache.value;
+  if (!typeCasts) {
+    const { rows } = await adapter.arrays(`SELECT s.typname, t.typname
+FROM pg_cast
+JOIN pg_type AS s ON s.oid = castsource
+JOIN pg_type AS t ON t.oid = casttarget`);
+    const directTypeCasts = /* @__PURE__ */ new Map();
+    for (const [source, target] of rows) {
+      const set = directTypeCasts.get(source);
+      if (set) {
+        set.add(target);
+      } else {
+        directTypeCasts.set(source, /* @__PURE__ */ new Set([target]));
+      }
+    }
+    typeCasts = /* @__PURE__ */ new Map();
+    for (const [type, directSet] of directTypeCasts.entries()) {
+      const set = new Set(directSet);
+      typeCasts.set(type, set);
+      for (const subtype of directSet) {
+        const subset = directTypeCasts.get(subtype);
+        if (subset) {
+          for (const type2 of subset) {
+            set.add(type2);
+          }
+        }
+      }
+    }
+    typeCastsCache.value = typeCasts;
+  }
+  return typeCasts;
+};
 const changeColumn = (changeTableData, key, dbName, dbColumn, codeColumn) => {
   dbColumn.data.as = codeColumn.data.as = void 0;
   const simpleCodeColumn = Object.create(codeColumn);
@@ -599,7 +612,17 @@ const getColumnDbType = (column, currentSchema) => {
     );
     return column.enumName = `${schema}.${name}`;
   } else if (column instanceof pqb.ArrayColumn) {
-    return column.data.item.dataType + "[]".repeat(column.data.arrayDims);
+    const { item } = column.data;
+    let type = item instanceof pqb.EnumColumn ? item.enumName : item.dataType;
+    type = type.startsWith(currentSchema + ".") ? type.slice(currentSchema.length + 1) : type;
+    return type + "[]".repeat(column.data.arrayDims);
+  } else if (column.data.isOfCustomType) {
+    let type = column.dataType;
+    const i = type.indexOf("(");
+    if (i !== -1) {
+      type = type.slice(0, i);
+    }
+    return type.includes(".") ? type : currentSchema + "." + type;
   } else {
     return column.dataType;
   }
@@ -2235,6 +2258,7 @@ const report = (ast, config, currentSchema) => {
         const toCodeCtx = {
           t: "t",
           table: a.name,
+          currentSchema,
           migration: true,
           snakeCase: config.snakeCase
         };
@@ -2252,7 +2276,8 @@ const report = (ast, config, currentSchema) => {
                 }).join(", ")}` : ""}${indexes?.length ? indexes.length === 1 ? ", has index" : `, has ${indexes.length} indexes` : ""}${excludes?.length ? excludes.length === 1 ? ", has exclude" : `, has ${excludes.length} excludes` : ""}${checks?.length ? `, checks ${checks.map((check) => check.sql.toSQL({ values: [] })).join(", ")}` : ""}`
               );
             } else if (change.type === "change") {
-              const name = change.from.column?.data.name ?? key;
+              let name = change.from.column?.data.name ?? key;
+              if (config.snakeCase) name = orchidCore.toCamelCase(name);
               const changes2 = [];
               inner.push(`${yellow("~ change column")} ${name}:`, changes2);
               changes2.push(`${yellow("from")}: `);
@@ -2267,7 +2292,7 @@ const report = (ast, config, currentSchema) => {
               }
             } else if (change.type === "rename") {
               inner.push(
-                `${yellow("~ rename column")} ${key} ${yellow("=>")} ${change.name}`
+                `${yellow("~ rename column")} ${config.snakeCase ? orchidCore.toCamelCase(key) : key} ${yellow("=>")} ${change.name}`
               );
             } else {
               rakeDb.exhaustive(change.type);
@@ -2695,8 +2720,11 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
           name: name2,
           column: column.data.as ?? new pqb.UnknownColumn(pqb.defaultSchemaConfig)
         });
-      } else if (column.dataType === "enum") {
-        processEnumColumn(column, currentSchema, codeItems);
+      } else {
+        const en = column.dataType === "enum" ? column : column instanceof pqb.ArrayColumn && column.data.item.dataType === "enum" ? column.data.item : void 0;
+        if (en) {
+          processEnumColumn(en, currentSchema, codeItems);
+        }
       }
     }
   }
@@ -2812,7 +2840,7 @@ const getTableInfosAndFKeys = (asts, config) => {
   }
   return { tableInfos, fkeys };
 };
-const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExportedAs) => {
+const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExportedAs, currentSchema) => {
   const tableInfo = tableInfos[ast.schema ? `${ast.schema}.${ast.name}` : ast.name];
   const imports = {
     "orchid-orm": "Selectable, Insertable, Updatable",
@@ -2832,7 +2860,10 @@ const appCodeGenTable = (tableInfos, fkeys, ast, baseTablePath, baseTableExporte
   const hasTableData = Boolean(
     ast.primaryKey || ast.indexes?.length || ast.excludes?.length || ast.constraints?.length
   );
-  const shapeCode = pqb.columnsShapeToCode({ t: "t", table: ast.name }, ast.shape);
+  const shapeCode = pqb.columnsShapeToCode(
+    { t: "t", table: ast.name, currentSchema },
+    ast.shape
+  );
   props.push(
     `columns = this.setColumns(${hasTableData ? "\n    " : ""}(t) => ({`,
     hasTableData ? [shapeCode] : shapeCode,
@@ -2896,7 +2927,7 @@ function importsToCode(imports) {
 }
 
 const { createSourceFile, ScriptTarget, SyntaxKind } = typescript;
-const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains) => {
+const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains, currentSchema) => {
   const content = await fs.readFile(dbPath, "utf-8");
   const statements = getTsStatements(content);
   const importName = getOrchidOrmImportName(statements);
@@ -2914,7 +2945,7 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains) => {
     if (extensions.length) {
       code += `
   extensions: [${extensions.map(
-        (ext) => ext.version ? `{ ${orchidCore.quoteObjectKey(ext.name)}: '${ext.version}' }` : orchidCore.singleQuote(ext.name)
+        (ext) => ext.version ? `{ ${orchidCore.quoteObjectKey(ext.name, false)}: '${ext.version}' }` : orchidCore.singleQuote(ext.name)
       ).join(", ")}],`;
     }
     if (domains.length) {
@@ -2922,9 +2953,10 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains) => {
   domains: {
     ${domains.sort((a, b) => a.name > b.name ? 1 : -1).map(
         (ast) => `${orchidCore.quoteObjectKey(
-          ast.schema ? `${ast.schema}.${ast.name}` : ast.name
+          ast.schema ? `${ast.schema}.${ast.name}` : ast.name,
+          false
         )}: (t) => ${ast.baseType.toCode(
-          { t: "t", table: ast.name },
+          { t: "t", table: ast.name, currentSchema },
           ast.baseType.data.name ?? ""
         )},`
       ).join("\n    ")}
@@ -3084,7 +3116,8 @@ const pull = async (options, config) => {
           fkeys,
           ast,
           baseTablePath,
-          baseTableExportedAs
+          baseTableExportedAs,
+          currentSchema
         );
         tables[table.key] = table;
         if (!firstTable) firstTable = table;
@@ -3118,7 +3151,8 @@ const pull = async (options, config) => {
     dbPath,
     tables,
     extensions,
-    domains
+    domains,
+    currentSchema
   );
   if (content) pendingFileWrites.push([dbPath, content]);
   if (firstTable) {