@warlock.js/cascade 5.22.1 → 5.23.0

package/esm/drivers/postgres/postgres-query-builder.mjs

@@ -254,7 +254,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	similarTo(column, embedding, alias = "score") {
 		const literal = `[${embedding.join(",")}]`;
 		const quotedCol = this.driver.dialect.quoteIdentifier(column);
-		const quotedTable = this.driver.dialect.quoteIdentifier(this.table);
+		const quotedTable = this.driver.dialect.quoteTableIdentifier(this.table);
 		this.addOperation("selectRaw", {
 			expression: `${quotedTable}.*`,
 			bindings: []
@@ -348,7 +348,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	}
 	/** Full-text search across the whole row, plus optional equality filters. */
 	textSearch(query, filters) {
-		const table = this.driver.dialect.quoteIdentifier(this.table);
+		const table = this.driver.dialect.quoteTableIdentifier(this.table);
 		this.addOperation("whereRaw", {
 			expression: `to_tsvector('english', ${table}::text) @@ plainto_tsquery('english', ?)`,
 			bindings: [query]
@@ -503,6 +503,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		if (this.fetchingCallback) await this.fetchingCallback(this);
 		const { query = "", bindings = [] } = new PostgresQueryParser({
 			table: this.table,
+			dialect: this.driver.dialect,
 			operations: toParserOps(this.operations)
 		}).parse();
 		try {
@@ -592,6 +593,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 			}]);
 			const inner = new PostgresQueryParser({
 				table: this.table,
+				dialect: this.driver.dialect,
 				operations: innerOps
 			}).parse();
 			query = `SELECT COUNT(*) AS "count" FROM (${inner.query}) AS "__count"`;
@@ -603,6 +605,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 			}]);
 			const parsed = new PostgresQueryParser({
 				table: this.table,
+				dialect: this.driver.dialect,
 				operations: countOps
 			}).parse();
 			query = parsed.query ?? "";
@@ -670,6 +673,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		]);
 		const { query = "", bindings = [] } = new PostgresQueryParser({
 			table: this.table,
+			dialect: this.driver.dialect,
 			operations: probeOps
 		}).parse();
 		return (await this.driver.query(query, bindings)).rows.length > 0;
@@ -693,7 +697,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		this.applyPendingScopes();
 		const { sql: filterSql, params: filterParams } = this.buildFilter();
 		const amountPlaceholder = `$${filterParams.length + 1}`;
-		const updateSql = `UPDATE ${this.driver.dialect.quoteIdentifier(this.table)} SET ${this.driver.dialect.quoteIdentifier(field)} = COALESCE(${this.driver.dialect.quoteIdentifier(field)}, 0) + ${amountPlaceholder} WHERE ctid IN (SELECT ctid FROM ${this.driver.dialect.quoteIdentifier(this.table)} ${filterSql} LIMIT 1 FOR UPDATE SKIP LOCKED) RETURNING ${this.driver.dialect.quoteIdentifier(field)}`;
+		const updateSql = `UPDATE ${this.driver.dialect.quoteTableIdentifier(this.table)} SET ${this.driver.dialect.quoteIdentifier(field)} = COALESCE(${this.driver.dialect.quoteIdentifier(field)}, 0) + ${amountPlaceholder} WHERE ctid IN (SELECT ctid FROM ${this.driver.dialect.quoteTableIdentifier(this.table)} ${filterSql} LIMIT 1 FOR UPDATE SKIP LOCKED) RETURNING ${this.driver.dialect.quoteIdentifier(field)}`;
 		return (await this.driver.query(updateSql, [...filterParams, amount])).rows[0]?.[field] ?? 0;
 	}
 	/** Decrement a numeric field. Returns new value. */
@@ -705,7 +709,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		this.applyPendingScopes();
 		const { sql: filterSql, params: filterParams } = this.buildFilter();
 		const amountPlaceholder = `$${filterParams.length + 1}`;
-		const updateSql = `UPDATE ${this.driver.dialect.quoteIdentifier(this.table)} SET ${this.driver.dialect.quoteIdentifier(field)} = COALESCE(${this.driver.dialect.quoteIdentifier(field)}, 0) + ${amountPlaceholder}` + (filterSql ? ` WHERE ${filterSql.replace("WHERE ", "")}` : "");
+		const updateSql = `UPDATE ${this.driver.dialect.quoteTableIdentifier(this.table)} SET ${this.driver.dialect.quoteIdentifier(field)} = COALESCE(${this.driver.dialect.quoteIdentifier(field)}, 0) + ${amountPlaceholder}` + (filterSql ? ` WHERE ${filterSql.replace("WHERE ", "")}` : "");
 		return (await this.driver.query(updateSql, [...filterParams, amount])).rowCount ?? 0;
 	}
 	/** Decrement a field for all matching rows. Returns affected row count. */
@@ -802,7 +806,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	async delete() {
 		this.applyPendingScopes();
 		const { sql, params } = this.buildFilter();
-		const deleteSql = `DELETE FROM ${this.driver.dialect.quoteIdentifier(this.table)} ${sql}`;
+		const deleteSql = `DELETE FROM ${this.driver.dialect.quoteTableIdentifier(this.table)} ${sql}`;
 		return (await this.driver.query(deleteSql, params)).rowCount ?? 0;
 	}
 	/**
@@ -814,7 +818,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	async deleteOne() {
 		this.applyPendingScopes();
 		const { sql: filterSql, params } = this.buildFilter();
-		const quotedTable = this.driver.dialect.quoteIdentifier(this.table);
+		const quotedTable = this.driver.dialect.quoteTableIdentifier(this.table);
 		const deleteSql = `DELETE FROM ${quotedTable} WHERE ctid IN (SELECT ctid FROM ${quotedTable} ${filterSql} LIMIT 1 FOR UPDATE SKIP LOCKED)`;
 		return (await this.driver.query(deleteSql, params)).rowCount ?? 0;
 	}
@@ -834,7 +838,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 			setParams.push(value);
 		}
 		if (setClauses.length === 0) throw new Error("No update operations specified");
-		const updateSql = `UPDATE ${this.driver.dialect.quoteIdentifier(this.table)} SET ${setClauses.join(", ")}` + (filterSql ? ` ${filterSql}` : "");
+		const updateSql = `UPDATE ${this.driver.dialect.quoteTableIdentifier(this.table)} SET ${setClauses.join(", ")}` + (filterSql ? ` ${filterSql}` : "");
 		return (await this.driver.query(updateSql, [...filterParams, ...setParams])).rowCount ?? 0;
 	}
 	/**
@@ -846,7 +850,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		if (fields.length === 0) throw new Error("No update operations specified");
 		const { sql: filterSql, params: filterParams } = this.buildFilter();
 		const setClauses = fields.map((field) => `${this.driver.dialect.quoteIdentifier(field)} = NULL`);
-		const updateSql = `UPDATE ${this.driver.dialect.quoteIdentifier(this.table)} SET ${setClauses.join(", ")}` + (filterSql ? ` ${filterSql}` : "");
+		const updateSql = `UPDATE ${this.driver.dialect.quoteTableIdentifier(this.table)} SET ${setClauses.join(", ")}` + (filterSql ? ` ${filterSql}` : "");
 		return (await this.driver.query(updateSql, filterParams)).rowCount ?? 0;
 	}
 	/**
@@ -866,6 +870,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		this.applyGroupByAggregates();
 		return new PostgresQueryParser({
 			table: this.table,
+			dialect: this.driver.dialect,
 			operations: toParserOps(this.operations)
 		}).parse();
 	}
@@ -1017,8 +1022,8 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	*/
 	buildHasSubquery(opType, relationName, definition, RelatedModel, constraintOps, operator, count) {
 		const dialect = this.driver.dialect;
-		const quotedSelfTable = dialect.quoteIdentifier(this.table);
-		const quotedRelatedTable = dialect.quoteIdentifier(RelatedModel.table);
+		const quotedSelfTable = dialect.quoteTableIdentifier(this.table);
+		const quotedRelatedTable = dialect.quoteTableIdentifier(RelatedModel.table);
 		const relationType = definition.type;
 		const selfModel = this.modelClass;
 		const conventions = this.dataSource?.relationDefaults;
@@ -1037,7 +1042,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 			joinCondition = `${quotedRelatedTable}.${dialect.quoteIdentifier(ownerKey)} = ${quotedSelfTable}.${dialect.quoteIdentifier(foreignKey)}`;
 		} else if (relationType === "belongsToMany") {
 			const pivotTableName = definition.pivot ?? inferPivotTable(selfModel?.name ?? "Model", RelatedModel.name, conventions);
-			const quotedPivot = dialect.quoteIdentifier(pivotTableName);
+			const quotedPivot = dialect.quoteTableIdentifier(pivotTableName);
 			const pivotLocalCol = definition.localKey ?? inferPivotKey(selfModel?.name ?? "Model", conventions);
 			const pivotForeignCol = definition.foreignKey ?? inferPivotKey(RelatedModel.name, conventions);
 			const selfPk = definition.pivotLocalKey ?? selfModel?.primaryKey ?? "id";
@@ -1095,7 +1100,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	*/
 	ensureMainColumnsForCount() {
 		if (this.operations.some((op) => op.type === "select" || op.type === "selectRaw" || op.type === "selectRelatedColumns")) return;
-		const quotedTable = this.driver.dialect.quoteIdentifier(this.table);
+		const quotedTable = this.driver.dialect.quoteTableIdentifier(this.table);
 		this.addOperation("selectRaw", {
 			expression: `${quotedTable}.*`,
 			bindings: []
@@ -1110,8 +1115,8 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	buildCountSubquery(alias, relationName, definition, RelatedModel, constraintOps) {
 		const dialect = this.driver.dialect;
 		const quotedAlias = dialect.quoteIdentifier(alias);
-		const quotedSelfTable = dialect.quoteIdentifier(this.table);
-		const quotedRelatedTable = dialect.quoteIdentifier(RelatedModel.table);
+		const quotedSelfTable = dialect.quoteTableIdentifier(this.table);
+		const quotedRelatedTable = dialect.quoteTableIdentifier(RelatedModel.table);
 		const relationType = definition.type;
 		const selfModel = this.modelClass;
 		const relatedMeta = RelatedModel;
@@ -1138,7 +1143,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		}
 		if (relationType === "belongsToMany") {
 			const pivotTableName = definition.pivot ?? inferPivotTable(selfModel?.name ?? "Model", relatedMeta.name, conventions);
-			const quotedPivot = dialect.quoteIdentifier(pivotTableName);
+			const quotedPivot = dialect.quoteTableIdentifier(pivotTableName);
 			const pivotLocalCol = definition.localKey ?? inferPivotKey(selfModel?.name ?? "Model", conventions);
 			const pivotForeignCol = definition.foreignKey ?? inferPivotKey(relatedMeta.name, conventions);
 			const selfPk = definition.pivotLocalKey ?? selfModel?.primaryKey ?? "id";
@@ -1177,6 +1182,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		};
 		const { query = "", bindings = [] } = new PostgresQueryParser({
 			table: relatedTable,
+			dialect: this.driver.dialect,
 			operations: toParserOps(whereOps)
 		}).parse();
 		const match = query.match(/WHERE\s+(.+)$/);
@@ -1319,6 +1325,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 		};
 		const { query = "", bindings = [] } = new PostgresQueryParser({
 			table: this.table,
+			dialect: this.driver.dialect,
 			operations: toParserOps(whereOps)
 		}).parse();
 		const whereMatch = query.match(/WHERE .+$/);