orchid-orm 1.69.1 → 1.69.3

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { DynamicRawSQL, QueryHooks, RawSql, VirtualColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, applyMixins, cloneQueryBaseUnscoped, defaultSchemaConfig, emptyArray, emptyObject, getCallerFilePath, getClonedQueryData, getColumnTypes, getFreeAlias, getPrimaryKeys, getQueryAs, getShapeFromSelect, getStackTrace, isExpression, isQueryReturnsAll, makeColumnTypes, noop, objectHasValues, parseTableData, pick, prepareSubQueryForSql, pushQueryOnForOuter, setQueryObjectValueImmutable, snakeCaseKey, toArray, toSnakeCase } from "pqb/internal";
+import { DynamicRawSQL, QueryHooks, RawSql, VirtualColumn, _appendQuery, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _orCreate, _prependWith, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertMany, _queryJoinOn, _queryRows, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, applyMixins, cloneQueryBaseUnscoped, defaultSchemaConfig, emptyArray, emptyObject, getCallerFilePath, getClonedQueryData, getColumnTypes, getFreeAlias, getPrimaryKeys, getQueryAs, getShapeFromSelect, getStackTrace, isExpression, isQueryReturnsAll, makeColumnTypes, noop, objectHasValues, parseTableData, pick, prepareSubQueryForSql, pushQueryOnForOuter, setQueryObjectValueImmutable, toArray, toSnakeCase } from "pqb/internal";
 import { Db, NotFoundError, OrchidOrmInternalError } from "pqb";
 import { AsyncLocalStorage } from "node:async_hooks";
 export * from "pqb";
@@ -81,7 +81,6 @@ function createBaseTable({ schemaConfig = defaultSchemaConfig, columnTypes: colu
 			throw new Error(`Failed to determine file path for table ${this.constructor.name}. Please set \`filePath\` property manually`);
 		}
 		setColumns(fn, dataFn) {
-			columnTypes[snakeCaseKey] = this.snakeCase;
 			const shape = getColumnTypes(columnTypes, fn, nowSQL, this.language);
 			const tableData = parseTableData(dataFn);
 			if (this.snakeCase) for (const key in shape) {
@@ -1381,7 +1380,13 @@ const assignTablesToOrm = (tables, result, adapter, qb, asyncStorage, commonOpti
 	for (const key in tables) {
 		if (key[0] === "$") throw new Error(`Table class name must not start with $`);
 		const tableClass = tables[key];
-		const table = tableClass.instance();
+		const tableImmutable = tableClass.instance();
+		const table = Object.create(tableImmutable);
+		table.q = { ...table.q };
+		table.columns = {
+			shape: { ...table.columns.shape },
+			data: { ...table.columns.data }
+		};
 		tableInstances[key] = table;
 		const options = {
 			...commonOptions,
@@ -1395,7 +1400,7 @@ const assignTablesToOrm = (tables, result, adapter, qb, asyncStorage, commonOpti
 			computed: table.computed,
 			nowSQL: tableClass.nowSQL
 		};
-		const dbTable = new Db(adapter, qb, table.table, table.columns.shape, table.types, asyncStorage, options, table.constructor.prototype.columns?.data ?? {});
+		const dbTable = new Db(adapter, qb, table.table, table.columns.shape, table.types, asyncStorage, options, table.columns?.data ?? {});
 		dbTable.definedAs = key;
 		dbTable.db = result;
 		dbTable.filePath = table.filePath;