orchid-orm 1.50.4 → 1.51.0

package/dist/migrations.mjs

@@ -1,6 +1,6 @@
 import { promptSelect, colors, getSchemaAndTableFromName, getDbTableColumnsChecks, dbColumnToAst, instantiateDbColumn, concatSchemaAndName, encodeColumnDefault, getIndexName, getExcludeName, getConstraintName, tableToAst, getDbStructureTableData, makeDomainsMap, astToMigration, createMigrationInterface, introspectDbSchema, exhaustive, pluralize, makeStructureToAstCtx, makeFileVersion, writeMigrationFile, migrate, structureToAst, saveMigratedVersion, rakeDbCommands } from 'rake-db';
 export * from 'rake-db';
-import { toSnakeCase, deepCompare, emptyArray, toArray, addCode, codeToString, toCamelCase, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
+import { toSnakeCase, deepCompare, emptyArray, toArray, toCamelCase, addCode, codeToString, toPascalCase, getImportPath, singleQuote, quoteObjectKey, pathToLog } from 'orchid-core';
 import { EnumColumn, ArrayColumn, getColumnBaseType, RawSQL, VirtualColumn, DomainColumn, UnknownColumn, defaultSchemaConfig, columnsShapeToCode, pushTableDataCode, Adapter } from 'pqb';
 import path from 'node:path';
 import { pathToFileURL } from 'url';
@@ -2275,7 +2275,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 = toCamelCase(name);
               const changes2 = [];
               inner.push(`${yellow("~ change column")} ${name}:`, changes2);
               changes2.push(`${yellow("from")}: `);
@@ -2290,7 +2291,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 ? toCamelCase(key) : key} ${yellow("=>")} ${change.name}`
               );
             } else {
               exhaustive(change.type);
@@ -2513,7 +2514,7 @@ const generate = async (options, config, args, afterPull) => {
   const [adapter] = adapters;
   const currentSchema = adapter.schema ?? "public";
   const db = await getDbFromConfig(config, dbPath);
-  const { columnTypes, internal } = db.$queryBuilder;
+  const { columnTypes, internal } = db.$qb;
   const codeItems = await getActualItems(
     db,
     currentSchema,
@@ -2598,7 +2599,7 @@ const getDbFromConfig = async (config, dbPath) => {
     pathToFileURL(path.resolve(config.basePath, dbPath)).toString()
   );
   const db = module[config.dbExportedAs ?? "db"];
-  if (!db?.$queryBuilder) {
+  if (!db?.$qb) {
     throw new Error(
       `Unable to import OrchidORM instance as ${config.dbExportedAs ?? "db"} from ${config.dbPath}`
     );
@@ -2943,7 +2944,7 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains, curre
     if (extensions.length) {
       code += `
   extensions: [${extensions.map(
-        (ext) => ext.version ? `{ ${quoteObjectKey(ext.name)}: '${ext.version}' }` : singleQuote(ext.name)
+        (ext) => ext.version ? `{ ${quoteObjectKey(ext.name, false)}: '${ext.version}' }` : singleQuote(ext.name)
       ).join(", ")}],`;
     }
     if (domains.length) {
@@ -2951,7 +2952,8 @@ const appCodeGenUpdateDbFile = async (dbPath, tables, extensions, domains, curre
   domains: {
     ${domains.sort((a, b) => a.name > b.name ? 1 : -1).map(
         (ast) => `${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, currentSchema },
           ast.baseType.data.name ?? ""