orchid-orm 1.71.1 → 1.72.1

package/dist/index.mjs

@@ -1,9 +1,10 @@
-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 { 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, internalSchemaConfig, 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";
 function createBaseTable({ schemaConfig = defaultSchemaConfig, columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs = "BaseTable", language, autoForeignKeys } = {}) {
-	const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(makeColumnTypes(schemaConfig)) : columnTypesArg || makeColumnTypes(schemaConfig);
+	const schema = schemaConfig();
+	const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(makeColumnTypes(schema)) : columnTypesArg || makeColumnTypes(schema);
 	const filePathOrStack = filePathArg || getStackTrace();
 	let filePath;
 	const defaultColumns = {
@@ -33,27 +34,27 @@ function createBaseTable({ schemaConfig = defaultSchemaConfig, columnTypes: colu
 		}
 		static inputSchema() {
 			this.instance();
-			return this._inputSchema === void 0 ? this._inputSchema = schemaConfig.inputSchema.call(this) : this._inputSchema;
+			return this._inputSchema === void 0 ? this._inputSchema = schema.inputSchema.call(this) : this._inputSchema;
 		}
 		static outputSchema() {
 			this.instance();
-			return this._outputSchema === void 0 ? this._outputSchema = schemaConfig.outputSchema.call(this) : this._outputSchema;
+			return this._outputSchema === void 0 ? this._outputSchema = schema.outputSchema.call(this) : this._outputSchema;
 		}
 		static querySchema() {
 			this.instance();
-			return this._querySchema === void 0 ? this._querySchema = schemaConfig.querySchema.call(this) : this._querySchema;
+			return this._querySchema === void 0 ? this._querySchema = schema.querySchema.call(this) : this._querySchema;
 		}
 		static createSchema() {
 			this.instance();
-			return this._createSchema === void 0 ? this._createSchema = schemaConfig.createSchema.call(this) : this._createSchema;
+			return this._createSchema === void 0 ? this._createSchema = schema.createSchema.call(this) : this._createSchema;
 		}
 		static updateSchema() {
 			this.instance();
-			return this._updateSchema === void 0 ? this._updateSchema = schemaConfig.updateSchema.call(this) : this._updateSchema;
+			return this._updateSchema === void 0 ? this._updateSchema = schema.updateSchema.call(this) : this._updateSchema;
 		}
 		static pkeySchema() {
 			this.instance();
-			return this._pkeySchema === void 0 ? this._pkeySchema = schemaConfig.pkeySchema.call(this) : this._pkeySchema;
+			return this._pkeySchema === void 0 ? this._pkeySchema = schema.pkeySchema.call(this) : this._pkeySchema;
 		}
 		static getFilePath() {
 			if (filePath) return filePath;
@@ -390,7 +391,7 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
 			for (let i = 0; i < len; i++) obj[primaryKeys[i]] = params[foreignKeys[i]];
 			return query.where(obj);
 		},
-		virtualColumn: new BelongsToVirtualColumn(defaultSchemaConfig, relationName, state),
+		virtualColumn: new BelongsToVirtualColumn(internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(getPrimaryKeys(query), reverseJoin, (joiningQuery, baseQuery) => join(baseQuery, joiningQuery, primaryKeys, foreignKeys)),
 		reverseJoin
 	};
@@ -632,7 +633,7 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
 				...values
 			});
 		},
-		virtualColumn: new HasOneVirtualColumn(defaultSchemaConfig, relationName, state),
+		virtualColumn: new HasOneVirtualColumn(internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(relPKeys, reverseJoin, (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)),
 		reverseJoin,
 		modifyRelatedQuery(relationQuery) {
@@ -817,7 +818,7 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
 				...values
 			});
 		},
-		virtualColumn: new HasManyVirtualColumn(defaultSchemaConfig, relationName, state),
+		virtualColumn: new HasManyVirtualColumn(internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(relPKeys, reverseJoin, (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)),
 		reverseJoin,
 		modifyRelatedQuery(relationQuery) {
@@ -1057,7 +1058,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
 			});
 			return on ? _queryDefaults(q, on) : q;
 		},
-		virtualColumn: new HasAndBelongsToManyVirtualColumn(subQuery, defaultSchemaConfig, relationName, state),
+		virtualColumn: new HasAndBelongsToManyVirtualColumn(subQuery, internalSchemaConfig, relationName, state),
 		joinQuery: joinQueryChainHOF(getPrimaryKeys(query), reverseJoin, (joiningQuery, baseQuery) => joinQuery(joiningQuery, getQueryAs(baseQuery), getQueryAs(joiningQuery), {
 			...joiningQuery.q.joinedShapes,
 			[baseQuery.q.as || baseQuery.table]: baseQuery.q.shape
@@ -1419,13 +1420,16 @@ const assignTablesToOrm = (tables, result, adapter, qb, asyncStorage, commonOpti
 const bundleOrchidORMTables = (tables) => {
 	const result = {};
 	let dbAwareInstance;
-	for (const key in tables) result[key] = { makeHelper(arg) {
-		let fn;
-		return (...args) => {
-			if (!fn) fn = dbAwareInstance[key].makeHelper(arg);
-			return fn(...args);
-		};
-	} };
+	for (const key in tables) result[key] = {
+		table: tables[key].instance().table,
+		makeHelper(arg) {
+			let fn;
+			return (...args) => {
+				if (!fn) fn = dbAwareInstance[key].makeHelper(arg);
+				return fn(...args);
+			};
+		}
+	};
 	Object.defineProperty(result, orchidORMBundleMetadataKey, {
 		enumerable: false,
 		value: {
@@ -1463,7 +1467,7 @@ const privateOrchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPr
 	} else {
 		adapter = options.adapter;
 		asyncStorage = new AsyncLocalStorage();
-		qb = _initQueryBuilder(adapter, makeColumnTypes(defaultSchemaConfig), asyncStorage, commonOptions, options);
+		qb = _initQueryBuilder(adapter, makeColumnTypes(defaultSchemaConfig(adapter.driverAdapter.schemaConfig)), asyncStorage, commonOptions, options);
 	}
 	qb.internal.rls = options.rls;
 	const result = {