pqb 0.66.5 → 0.66.7

package/dist/index.mjs

@@ -6483,7 +6483,7 @@ const setMutativeQueriesSelectRelationsSqlState = (d, as, rel) => {
 const handleInsertAndUpdateSelectRelationsSqlState = (ctx, state) => {
 	if (state) ctx.topCtx.mutativeQueriesSelectRelationsSqlState = state;
 };
-const handleDeleteSelectRelationsSqlState = (ctx, query, relationSelectState, returning) => {
+const handleDeleteSelectRelationsSqlState = (ctx, query, relationSelectState) => {
 	const selectRelations = relationSelectState?.value;
 	if (!selectRelations) return;
 	const selectPrimaryKeysQuery = prepareSubQueryForSql(query, _clone(query));
@@ -6491,7 +6491,6 @@ const handleDeleteSelectRelationsSqlState = (ctx, query, relationSelectState, re
 	_addToHookSelect(selectPrimaryKeysQuery, primaryKeys, true);
 	const { as: cteAs } = moveQueryToCte(ctx, selectPrimaryKeysQuery, void 0, true);
 	const relKeys = Object.keys(selectRelations);
-	ctx.selectedCount = (returning ? ctx.selectedCount : 0) + relKeys.length;
 	const hookSelect = selectPrimaryKeysQuery.q.hookSelect;
 	const join = {
 		type: "JOIN",
@@ -6817,7 +6816,10 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
 			q.q.select = [query.q.expr];
 			ands.push(`(${moveMutativeQueryToCte(ctx, q)})`);
 		}
-		else pushWhereToSql(ands, ctx, query, query.q, query.table && `"${query.table}"`, true);
+		else {
+			const as = getQueryAs(query);
+			pushWhereToSql(ands, ctx, query, query.q, as && `"${as}"`, true);
+		}
 		return;
 	}
 	if (isExpression(data)) {
@@ -7381,7 +7383,7 @@ const pushDeleteSql = (ctx, query, q, quotedAs, isSubSql) => {
 	if (q.as && query.table !== q.as) ctx.sql.push(quotedAs);
 	const relationSelectState = newMutativeQueriesSelectRelationsSqlState(query);
 	let returning = makeReturningSql(ctx, query, q, quotedAs, relationSelectState, "Delete", void 0, isSubSql);
-	const selectRelations = handleDeleteSelectRelationsSqlState(ctx, query, relationSelectState, returning);
+	const selectRelations = handleDeleteSelectRelationsSqlState(ctx, query, relationSelectState);
 	let join = q.join;
 	if (selectRelations) {
 		returning = (returning ? returning + ", " : "") + selectRelations.addReturning;
@@ -13028,12 +13030,14 @@ var QueryMethods = class {
 	*/
 	makeHelper(fn) {
 		const helperAs = this.q.as || this.table;
-		return ((query, ...args) => {
+		const helper = ((query, ...args) => {
 			const q = _clone(query);
 			const as = _getQueryAs(q);
 			if (as) _setQueryAlias(q, as, helperAs);
 			return fn(q, ...args);
 		});
+		helper.table = this.table;
+		return helper;
 	}
 	/**
 	* `useHelper` allows to use {@link makeHelper} in different queries:
@@ -13624,6 +13628,12 @@ const _initQueryBuilder = (adapter, columnTypes, asyncStorage, commonOptions, op
 	qb.internal.generatorIgnore = options.generatorIgnore;
 	qb.internal.roles = options.roles;
 	qb.internal.managedRolesSql = options.managedRolesSql;
+	qb.internal.defaultGrantedBy = options.defaultGrantedBy;
+	if (options.grants) qb.internal.grants = options.grants.map((grant) => ({
+		...grant,
+		to: toArray(grant.to)
+	}));
+	qb.internal.rls = options.rls;
 	return qb.qb = qb;
 };
 const getSetRoleSql = (parentRole, options) => {
@@ -13715,7 +13725,7 @@ var AdapterClass = class AdapterClass {
 	}
 	assignError(to, from) {
 		const { errorFields } = this.driverAdapter;
-		for (const key in errorFields) to[key] = from[key];
+		for (const key in errorFields) to[key] = from[errorFields[key]];
 	}
 };
 /**
@@ -14221,6 +14231,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, 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, Grant, 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, quoteIdentifier, 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