pqb 0.66.1 → 0.66.3

package/dist/index.mjs

@@ -287,12 +287,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);
@@ -462,7 +456,7 @@ const makeIndex = (columns, first, second) => {
 	} };
 	else return { index: {
 		columns,
-		options: first ?? {}
+		options: { ...first }
 	} };
 };
 const tableDataMethods = {
@@ -2028,10 +2022,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);
 	}
@@ -3924,6 +3918,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
@@ -3931,7 +3926,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;
@@ -3939,7 +3934,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;
 		}
 	}
@@ -4858,7 +4853,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];
@@ -6920,7 +6915,7 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
 	const columnsSql = arg.columns.map((column) => columnToSql(ctx, query, query.shape, column, quotedAs)).join(", ");
 	ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
 };
-const MAX_BINDING_PARAMS = 65536;
+const MAX_BINDING_PARAMS = 65533;
 const makeInsertSql = (ctx, q, query, quotedAs, isSubSql) => {
 	let { columns } = query;
 	const { shape, hookCreateSet } = query;
@@ -6995,8 +6990,8 @@ const makeInsertSql = (ctx, q, query, quotedAs, isSubSql) => {
 			let encodedRow = encodeRow(ctx, ctxValues, QueryClass, values[i], runtimeDefaults, quotedAs, hookSetSql);
 			ctx.skipBatchCheck = skipBatchCheck;
 			if (!upsert) encodedRow = "(" + encodedRow + ")";
-			if (ctxValues.length > 65536) {
-				if (ctxValues.length - currentValuesLen > 65536) throw new Error(`Too many parameters for a single insert row, max is ${MAX_BINDING_PARAMS}`);
+			if (ctxValues.length > 65533) {
+				if (ctxValues.length - currentValuesLen > 65533) throw new Error(`Too many parameters for a single insert row, max is ${MAX_BINDING_PARAMS}`);
 				if (!skipBatchCheck) {
 					setTopCteSize(ctx, topCteSize);
 					applySqlState(sqlState);
@@ -13231,12 +13226,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;
@@ -13253,8 +13247,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;
@@ -13569,13 +13567,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 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));
@@ -14211,6 +14208,6 @@ const testTransaction = {
 		if (db.internal[trxForTest]?.length === 0) return db.q.adapter.close();
 	}
 };
-export { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, Operators, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, 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 { AdapterClass, ArrayColumn, BigIntColumn, BigSerialColumn, BitColumn, BitVaryingColumn, BooleanColumn, BoxColumn, ByteaColumn, CidrColumn, CircleColumn, CitextColumn, Column, CustomTypeColumn, DateBaseColumn, DateColumn, DateTimeBaseClass, DateTimeTzBaseClass, Db, DecimalColumn, DomainColumn, DoublePrecisionColumn, DynamicRawSQL, EnumColumn, Expression, InetColumn, IntegerBaseColumn, IntegerColumn, IntervalColumn, JSONColumn, JSONTextColumn, LimitedTextBaseColumn, LineColumn, LsegColumn, MacAddr8Column, MacAddrColumn, MoneyColumn, NotFoundError, NumberAsStringBaseColumn, NumberBaseColumn, Operators, OrchidOrmInternalError, PathColumn, PointColumn, PolygonColumn, PostgisGeographyPointColumn, QueryError, QueryHookUtils, QueryHooks, RawSql, RealColumn, SerialColumn, SmallIntColumn, SmallSerialColumn, StringColumn, TextBaseColumn, TextColumn, TimeColumn, TimestampColumn, TimestampTZColumn, TransactionAdapterClass, TsQueryColumn, TsVectorColumn, UUIDColumn, UnknownColumn, VarCharColumn, VirtualColumn, 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 };
 
 //# sourceMappingURL=index.mjs.map