orchid-orm 1.71.1 → 1.72.1

package/dist/migrations/index.mjs

@@ -1,5 +1,5 @@
 import { astToMigration, concatSchemaAndName, createMigrationInterface, dbColumnToAst, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCommands, saveMigratedVersion, structureToAst, tableToAst, writeMigrationFile } from "rake-db";
-import { ArrayColumn, DomainColumn, EnumColumn, RawSql, UnknownColumn, VirtualColumn, addCode, codeToString, colors, columnsShapeToCode, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, exhaustive, getColumnBaseType, getFreeSetAlias, getImportPath, getQuerySchema, getSupportedDefaultPrivileges, pathToLog, pluralize, pushTableDataCode, quoteObjectKey, singleQuote, toArray, toCamelCase, toPascalCase, toSnakeCase } from "pqb/internal";
+import { ArrayColumn, DomainColumn, EnumColumn, RawSql, UnknownColumn, VirtualColumn, addCode, codeToString, colors, columnsShapeToCode, deepCompare, emptyArray, emptyObject, exhaustive, getColumnBaseType, getDriverErrorCode, getFreeSetAlias, getImportPath, getQuerySchema, getSupportedDefaultPrivileges, pathToLog, pluralize, pushTableDataCode, quoteObjectKey, singleQuote, toArray, toCamelCase, toPascalCase, toSnakeCase } from "pqb/internal";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import fs from "node:fs/promises";
@@ -18,7 +18,7 @@ const compareSqlExpressions = async (tableExpressions, adapter) => {
 		].join("; ");
 		const query = () => adapter.query(combinedQueries, values);
 		const result = await (adapter.isInTransaction() ? adapter.savepoint(viewName, query) : query()).then((res) => res[1], async (err) => {
-			if (err.code !== "42704") throw err;
+			if (typeof err === "object" && getDriverErrorCode(err) !== "42704") throw err;
 		});
 		if (!result) {
 			handle();
@@ -346,7 +346,7 @@ const compareColumns = async (adapter, domainsMap, ast, currentSchema, compareSq
 const getTypeCasts = async (adapter, typeCastsCache) => {
 	let typeCasts = typeCastsCache.value;
 	if (!typeCasts) {
-		const { rows } = await adapter.arrays(`SELECT s.typname, t.typname
+		const { rows } = await adapter.arrays(`SELECT s.typname s, t.typname t
 FROM pg_cast
 JOIN pg_type AS s ON s.oid = castsource
 JOIN pg_type AS t ON t.oid = casttarget`);
@@ -1730,7 +1730,7 @@ const getColumnDbTypeForComparison = (column, currentSchema) => {
 const freezeSqlClock = (sql) => sql.replaceAll("clock_timestamp()", `'0.1ms'::interval + now()`);
 const applyCompareSql = async (compareSql, adapter) => {
 	if (compareSql.expressions.length) {
-		const { rows: [results] } = await adapter.arrays("SELECT " + compareSql.expressions.map((x) => `${freezeSqlClock(x.inDb)} = (${x.inCode && freezeSqlClock(x.inCode)})`).join(", "), compareSql.values);
+		const { rows: [results] } = await adapter.arrays("SELECT " + compareSql.expressions.map((x, i) => `${freezeSqlClock(x.inDb)} = (${x.inCode && freezeSqlClock(x.inCode)}) "${i}"`).join(", "), compareSql.values);
 		for (let i = 0; i < results.length; i++) if (!results[i]) compareSql.expressions[i].change();
 	}
 };
@@ -2922,7 +2922,7 @@ const getActualItems = async (db, currentSchema, internal, columnTypes) => {
 				domains.set(column.dataType, {
 					schemaName,
 					name,
-					column: column.data.as ?? new UnknownColumn(defaultSchemaConfig)
+					column: column.data.as ?? UnknownColumn.instance
 				});
 			} else {
 				const en = column.dataType === "enum" ? column : column instanceof ArrayColumn && column.data.item.dataType === "enum" ? column.data.item : void 0;