pqb 0.66.0 → 0.66.2

package/dist/index.d.ts

@@ -1089,12 +1089,6 @@ declare class BigSerialColumn<Schema extends ColumnSchemaConfig> extends NumberA
   toSQL(): string;
   toCode(ctx: ColumnToCodeCtx, key: string): Code;
 }
-/**
- * Symbol that turns on a snake case column names.
- * It is set on the column types.
- * When it's on, column names in ORM are still as user types them, but they are translated to snake_case when generating SQL.
- */
-declare const snakeCaseKey: unique symbol;
 interface TimeInterval {
   years?: number;
   months?: number;
@@ -4560,9 +4554,6 @@ interface DbTableOptions<ColumnTypes, Table extends string | undefined, Shape ex
    */
   nowSQL?: string;
 }
-/**
- * See {@link ScopeMethods}
- */
 type DbTableOptionScopes<Table extends string | undefined, Shape extends Column.QueryColumns, Keys extends string = string> = { [K in Keys]: (q: ScopeArgumentQuery<Table, Shape>) => IsQuery };
 interface QueryBuilder extends Query {
   returnType: undefined;
@@ -4571,7 +4562,6 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Col
   adapterNotInTransaction: Adapter;
   qb: QueryBuilder;
   table: Table;
-  shape: ShapeWithComputed;
   columnTypes: ColumnTypes;
   q: QueryData;
   __isQuery: true;
@@ -4596,7 +4586,8 @@ declare class Db<Table extends string | undefined = undefined, Shape extends Col
   error: new (message: string, length: number, name: QueryErrorName) => QueryError<this>;
   internal: QueryInternal<{ [K in keyof PrimaryKeys]: (keyof PrimaryKeys extends K ? never : keyof PrimaryKeys) extends never ? PrimaryKeys[K] : never }[keyof PrimaryKeys], PrimaryKeys | UniqueColumns, { [K in keyof Shape]: Shape[K]['data']['unique'] extends string ? K : never }[keyof Shape] | keyof PrimaryKeys, UniqueColumnTuples, UniqueConstraints>;
   catch: QueryCatch;
-  constructor(adapterNotInTransaction: Adapter, qb: QueryBuilder, table: Table | undefined, shape: ShapeWithComputed | undefined, columnTypes: ColumnTypes, asyncStorage: AsyncLocalStorage<AsyncState>, options: DbTableOptions<ColumnTypes, Table, ShapeWithComputed>, tableData?: TableData);
+  shape: ShapeWithComputed;
+  constructor(adapterNotInTransaction: Adapter, qb: QueryBuilder, table: Table | undefined, shape: ShapeWithComputed, columnTypes: ColumnTypes, asyncStorage: AsyncLocalStorage<AsyncState>, options: DbTableOptions<ColumnTypes, Table, ShapeWithComputed>, tableData?: TableData);
   /**
    * When in transaction, returns a db adapter object for the transaction,
    * returns a default adapter object otherwise.
@@ -10471,4 +10462,4 @@ declare const testTransaction: {
    */
   close(arg: Arg$1): Promise<void>;
 };
-export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnData, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbRlsOptions, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type HookSelectValue, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmInternalError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, QueryError, type QueryHasWhere, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TableRlsConfig, type TemplateLiteralArgs, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _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, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, snakeCaseKey, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
+export { type Adapter, AdapterClass, type AdapterConfigBase, type AdapterParams, type AfterCommitStandaloneHook, type AfterHook, ArrayColumn, type ArrayColumnValue, type ArrayData, type AsyncState, type BaseNumberData, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, type Code, type Codes, Column, type ColumnFromDbParams, type ColumnSchemaConfig, type ColumnSchemaGetterColumns, type ColumnSchemaGetterTableClass, type ColumnToCodeCtx, type ColumnTypeSchemaArg, type ColumnsByType, type ColumnsShape, type ComputedColumnsFromOptions, type ComputedOptionsConfig, type ComputedOptionsFactory, type CreateCtx, type CreateData, type CreateManyMethodsNames, type CreateMethodsNames, type CreateSelf, CustomTypeColumn, DateBaseColumn, DateColumn, type DateColumnData, DateTimeBaseClass, DateTimeTzBaseClass, Db, type DbDomainArg, type DbExtension, type DbOptions, type DbResult, type DbRlsOptions, type DbSharedOptions, type DbSqlMethod, type DbStructureDomainsMap, type DbTableOptionScopes, type DbTableOptions, DecimalColumn, type DecimalColumnData, type DefaultColumnTypes, type DefaultPrivileges, type DefaultSchemaConfig, type DeleteMethodsNames, DomainColumn, DoublePrecisionColumn, type DriverAdapter, DynamicRawSQL, type EmptyObject, type EmptyTuple, EnumColumn, Expression, type FromArg, type FromResult, type GeneratorIgnore, type HookSelectValue, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, type IsQuery, type IsolationLevel, JSONColumn, JSONTextColumn, type JoinQueryMethod, type JoinedShapes, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, type MapTableScopesOption, type MaybeArray, type MaybePromise, type MergeQuery, MoneyColumn, type NoPrimaryKeyOption, type NonUniqDataItem, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, type NumberColumnData, Operators, type OperatorsArray, type OperatorsJson, type OperatorsOrdinalText, OrchidOrmInternalError, type Ord, PathColumn, type PickQueryInputType, type PickQueryInternal, type PickQueryQ, type PickQueryRelations, type PickQuerySelectableRelations, type PickQueryShape, PointColumn, PolygonColumn, PostgisGeographyPointColumn, type Query, type QueryAfterHook, type QueryArraysResult, type QueryBeforeActionHook, type QueryBeforeHook, type QueryData, QueryError, type QueryHasWhere, type QueryHelperResult, QueryHookUtils, QueryHooks, type QueryInternal, type QueryLogObject, type QueryLogOptions, type QueryLogger, type QueryManyTake, type QueryManyTakeOptional, type QueryOrExpression, type QueryResult, type QueryResultRow, type QueryReturnType, type QuerySchema, type QueryScopes, RawSql, type RawSqlBase, RealColumn, type RecordKeyTrue, type RecordOptionalString, type RecordString, type RecordStringOrNumber, type RecordUnknown, type RelationConfigBase, type RelationJoinQuery, type RelationsBase, type SearchWeight, type SelectableFromShape, SerialColumn, type SerialColumnData, type ShallowSimplify, type ShapeColumnPrimaryKeys, type ShapeUniqueColumns, type SingleSql, type SingleSqlItem, SmallIntColumn, SmallSerialColumn, type Sql, type SqlFn, type SqlSessionState, type StorageOptions, StringColumn, type StringData, type TableData, type TableDataFn, type TableDataInput, type TableDataItem, type TableDataItemsUniqueColumnTuples, type TableDataItemsUniqueColumns, type TableDataItemsUniqueConstraints, type TableDataMethods, type TableRlsConfig, type TemplateLiteralArgs, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, type Timestamps, TransactionAdapterClass, type TransactionOptions, TsQueryColumn, TsVectorColumn, UUIDColumn, type UniqueConstraints, type UniqueTableDataItem, UnknownColumn, type UpdateData, type UpsertData, type UpsertThis, VarCharColumn, VirtualColumn, type WhereArg, XMLColumn, _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, addCode, addTopCte, addTopCteSql, applyMixins, assignDbDataToColumn, backtickQuote, cloneQueryBaseUnscoped, codeToString, colors, columnsShapeToCode, constraintInnerToCode, consumeColumnName, copyTableData, createDbWithAdapter, deepCompare, defaultSchemaConfig, emptyArray, emptyObject, escapeForMigration, escapeString, excludeInnerToCode, exhaustive, getCallerFilePath, getClonedQueryData, getColumnBaseType, getColumnInfo, getColumnTypes, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, referencesArgsToCode, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };

package/dist/index.js

@@ -310,12 +310,6 @@ const rollbackSql = { text: "ROLLBACK" };
 const quoteIdentifier = (role) => {
 	return `"${role.replace(/"/g, "\"\"")}"`;
 };
-/**
-* Symbol that turns on a snake case column names.
-* It is set on the column types.
-* When it's on, column names in ORM are still as user types them, but they are translated to snake_case when generating SQL.
-*/
-const snakeCaseKey = Symbol("snakeCase");
 var Expression = class {
 	toSQL(ctx, quotedAs) {
 		let sql = this.makeSQL(ctx, quotedAs);
@@ -485,7 +479,7 @@ const makeIndex = (columns, first, second) => {
 	} };
 	else return { index: {
 		columns,
-		options: first ?? {}
+		options: { ...first }
 	} };
 };
 const tableDataMethods = {
@@ -2051,10 +2045,10 @@ var ArrayColumn = class ArrayColumn extends Column {
 		}
 		const code = [open];
 		const { item } = this.data;
-		const { isNullable } = item.data;
-		delete item.data.isNullable;
-		addCode(code, item.toCode(ctx, key));
-		item.data.isNullable = isNullable;
+		const clonedItem = Object.create(item);
+		const { isNullable: _, ...dataWithoutNullable } = item.data;
+		clonedItem.data = dataWithoutNullable;
+		addCode(code, clonedItem.toCode(ctx, key));
 		addCode(code, `${close}${arrayDataToCode(this.data, ctx.migration)}`);
 		return columnCode(this, ctx, key, code);
 	}
@@ -3947,6 +3941,7 @@ const applyComputedColumns = (q, fn) => {
 	for (const key in computed) {
 		let item = computed[key];
 		if (typeof item === "function") item = item.call(computed);
+		item = Object.create(item);
 		if (item instanceof ComputedColumn) q.q.runtimeComputeds = {
 			...q.q.runtimeComputeds,
 			[key]: item
@@ -3954,7 +3949,7 @@ const applyComputedColumns = (q, fn) => {
 		else {
 			let col = item.result.value;
 			if (!col) {
-				item.result.value = col = Object.create(UnknownColumn.instance);
+				item.result = { value: col = Object.create(UnknownColumn.instance) };
 				col.data = { ...col.data };
 			}
 			q.shape[key] = col;
@@ -3962,7 +3957,7 @@ const applyComputedColumns = (q, fn) => {
 			data.computed = item;
 			data.explicitSelect = true;
 			data.readOnly = true;
-			const parse = item.result.value._parse;
+			const parse = col._parse;
 			if (parse) (q.q.defaultParsers ??= {})[key] = parse;
 		}
 	}
@@ -4881,7 +4876,7 @@ function queryFrom(self, arg) {
 			arg = arg.slice(i + 1);
 		} else if (w) data.schema = void 0;
 	} else if (Array.isArray(arg)) {
-		const { shape } = data;
+		const shape = { ...data.shape };
 		const joinedParsers = {};
 		for (const item of arg) if (typeof item === "string") {
 			const w = data.withShapes[item];
@@ -13254,12 +13249,11 @@ const performQuery = async (q, args, method) => {
 	}
 };
 var Db = class extends QueryMethods {
-	constructor(adapterNotInTransaction, qb, table = void 0, shape = anyShape, columnTypes, asyncStorage, options, tableData = {}) {
+	constructor(adapterNotInTransaction, qb, table = void 0, shape, columnTypes, asyncStorage, options, tableData = {}) {
 		super();
 		this.adapterNotInTransaction = adapterNotInTransaction;
 		this.qb = qb;
 		this.table = table;
-		this.shape = shape;
 		this.columnTypes = columnTypes;
 		const self = this;
 		const { softDelete } = options;
@@ -13276,8 +13270,12 @@ var Db = class extends QueryMethods {
 		let runtimeDefaultColumns;
 		let selectAllCount = 0;
 		const { snakeCase } = options;
+		if (shape !== anyShape) shape = { ...shape };
+		this.shape = shape;
 		for (const key in shape) {
-			const column = shape[key];
+			const column = Object.create(shape[key]);
+			shape[key] = column;
+			column.data = { ...column.data };
 			column.data.key = key;
 			if (column._parse) {
 				hasParsers = true;
@@ -13592,13 +13590,12 @@ const createDbWithAdapter = ({ log, logger, snakeCase, schemaConfig = defaultSch
 		snakeCase
 	};
 	const ct = typeof ctOrFn === "function" ? ctOrFn(makeColumnTypes(schemaConfig)) : ctOrFn;
-	if (snakeCase) ct[snakeCaseKey] = true;
 	const asyncStorage = new node_async_hooks.AsyncLocalStorage();
 	const qb = _initQueryBuilder(adapter, ct, asyncStorage, commonOptions, options);
 	commonOptions.schema = schema;
 	const { nowSQL } = options;
 	const tableConstructor = (table, shape, dataFn, options) => {
-		return new Db(adapter, qb, table, typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options?.language) : shape, ct, asyncStorage, {
+		return new Db(adapter, qb, table, typeof shape === "function" ? getColumnTypes(ct, shape, nowSQL, options?.language) : shape || anyShape, ct, asyncStorage, {
 			...commonOptions,
 			...options
 		}, parseTableData(dataFn));
@@ -14407,7 +14404,6 @@ exports.setDefaultLanguage = setDefaultLanguage;
 exports.setFreeAlias = setFreeAlias;
 exports.setQueryObjectValueImmutable = setQueryObjectValueImmutable;
 exports.singleQuote = singleQuote;
-exports.snakeCaseKey = snakeCaseKey;
 exports.tableDataMethods = tableDataMethods;
 exports.testTransaction = testTransaction;
 exports.toArray = toArray;