pqb 0.67.4 → 0.67.6

package/dist/index.mjs

@@ -8010,12 +8010,12 @@ var FnExpression = class extends Expression {
 		if (options.distinct && !options.withinGroup) sql.push("DISTINCT ");
 		const q = this.q;
 		sql.push(this.args.map((arg) => {
-			if (typeof arg === "string") return arg === "*" ? "*" : columnToSql(ctx, q, q.shape, arg, quotedAs);
+			if (typeof arg === "string") return arg === "*" ? "*" : fnArgToSql(ctx, q, arg, quotedAs);
 			else if (arg instanceof Expression) return arg.toSQL(ctx, quotedAs);
 			else if ("pairs" in arg) {
 				const args = [];
 				const { pairs } = arg;
-				for (const key in pairs) args.push(`${addValue(values, key)}::text, ${rawOrColumnToSql(ctx, q, pairs[key], quotedAs)}`);
+				for (const key in pairs) args.push(`${addValue(values, key)}::text, ${fnArgToSql(ctx, q, pairs[key], quotedAs)}`);
 				return args.join(", ");
 			} else return addValue(values, arg.value);
 		}).join(", "));
@@ -8039,6 +8039,13 @@ var FnExpression = class extends Expression {
 		return sql.join("");
 	}
 };
+const fnArgToSql = (ctx, data, arg, quotedAs) => {
+	if (typeof arg === "string") {
+		if (arg.endsWith(".*") || data.valuesJoinedAs?.[arg]) return columnToSql(ctx, data, data.shape, arg, quotedAs);
+		return selectedColumnToSql(ctx, data, data.shape, arg, quotedAs);
+	}
+	return arg.toSQL(ctx, quotedAs);
+};
 function makeFnExpression(self, type, fn, args, options) {
 	const q = extendQuery(self, type.operators);
 	q.baseQuery.type = ExpressionTypeMethod.prototype.type;
@@ -9835,6 +9842,34 @@ const getSqlText = (sql) => {
 	if ("text" in sql) return sql.text;
 	throw new Error(`Batch SQL is not supported in this query`);
 };
+const queryToSql = (query) => {
+	const sql = query.toSQL();
+	if ("batch" in sql) throw new OrchidOrmInternalError(query, "Batch SQL is not supported in query definitions");
+	return sql;
+};
+const rawSqlToSql = (sql) => {
+	if (typeof sql === "string") return { text: sql };
+	const values = [];
+	return {
+		text: sql.toSQL({ values }),
+		values
+	};
+};
+const sqlToRawSql = (sql) => {
+	const { values } = sql;
+	if (!values?.length) return raw({ raw: sql.text });
+	const rawValues = {};
+	for (let i = 0; i < values.length; i++) rawValues[`queryValue${i + 1}`] = values[i];
+	return raw({ raw: replaceSqlPlaceholders(sql.text, values.length) }).values(rawValues);
+};
+const replaceSqlPlaceholders = (sql, valuesCount) => {
+	const parts = sql.split("'");
+	for (let i = 0; i < parts.length; i += 2) parts[i] = parts[i].replace(/\$(\d+)/g, (match, index) => {
+		const number = Number(index);
+		return number > 0 && number <= valuesCount ? `$queryValue${number}` : match;
+	});
+	return parts.join("'");
+};
 var QuerySql = class {
 	sql(...args) {
 		const sql = raw(...args);
@@ -12543,6 +12578,25 @@ function getSupportedDefaultPrivileges(version) {
 	supportedPrivilegesCache.set(version, result);
 	return result;
 }
+const makeRefreshMaterializedViewSql = (query, options) => {
+	if (options?.concurrently && options.withData === false) throw new Error("Cannot refresh a materialized view concurrently with WITH NO DATA");
+	const sql = ["REFRESH MATERIALIZED VIEW"];
+	if (options?.concurrently) sql.push("CONCURRENTLY");
+	sql.push(quoteTableWithSchema(query));
+	if (options?.withData === true) sql.push("WITH DATA");
+	else if (options?.withData === false) sql.push("WITH NO DATA");
+	return {
+		text: sql.join(" "),
+		values: []
+	};
+};
+/**
+* Refresh a materialized view.
+*/
+const refreshMaterializedView = async (query, options) => {
+	const sql = makeRefreshMaterializedViewSql(query, options);
+	await (query.internal.asyncStorage.getStore()?.transactionAdapter || query.q.adapter).query(sql.text, sql.values);
+};
 var QueryJsonMethods = class {
 	/**
 	* Wraps the query in a way to select a single JSON string.
@@ -13801,7 +13855,7 @@ const performQuery = async (q, args, method) => {
 	}
 };
 var Db = class extends QueryMethods {
-	constructor(adapterNotInTransaction, qb, table = void 0, shape, columnTypes, asyncStorage, options, tableData = {}) {
+	constructor(adapterNotInTransaction, qb, table = void 0, shape, columnTypes, asyncStorage, options, tableData = {}, viewData) {
 		super();
 		this.adapterNotInTransaction = adapterNotInTransaction;
 		this.qb = qb;
@@ -13867,7 +13921,10 @@ var Db = class extends QueryMethods {
 			noPrimaryKey: options.noPrimaryKey === "ignore",
 			comment: options.comment,
 			readOnly: options.readOnly,
+			materialized: options.materialized,
+			generatorIgnored: options.generatorIgnore,
 			nowSQL: options.nowSQL,
+			viewData,
 			tableData,
 			selectAllCount
 		};
@@ -14398,6 +14455,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, _appendQueryOnUpsertCreate, _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, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, 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 };
+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, _appendQueryOnUpsertCreate, _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, getDateAsDateFn, getDateAsNumberFn, getDriverErrorCode, getFreeAlias, getFreeSetAlias, getImportPath, getPrimaryKeys, getQueryAs, getQuerySchema, getShapeFromSelect, getSqlText, getStackTrace, getSupportedDefaultPrivileges, indexInnerToCode, internalSchemaConfig, isExpression, isQueryReturnsAll, isRawSQL, logColors, logParamToLogObject, makeColumnNullable, makeColumnTypes, makeColumnsByType, makeConnectRetryConfig, noop, objectHasValues, omit, parseTableData, parseTableDataInput, pathToLog, pick, pluralize, prepareSubQueryForSql, primaryKeyInnerToCode, pushQueryOnForOuter, pushQueryValueImmutable, pushTableDataCode, queryToSql, quoteIdentifier, quoteObjectKey, quoteTableWithSchema, raw, rawSqlToCode, rawSqlToSql, referencesArgsToCode, refreshMaterializedView, returnArg, setColumnData, setColumnEncode, setColumnParse, setColumnParseNull, setCurrentColumnName, setDataValue, setDefaultLanguage, setFreeAlias, setQueryObjectValueImmutable, singleQuote, sqlToRawSql, tableDataMethods, testTransaction, toArray, toCamelCase, toPascalCase, toSnakeCase, wrapAdapterFnWithConnectRetry };
 
 //# sourceMappingURL=index.mjs.map