pqb 0.65.5 → 0.66.0

package/dist/index.js

@@ -6778,17 +6778,19 @@ const coalesce = (ctx, query, sql, quotedAs) => {
 	if (coalesceValue !== void 0) return `COALESCE(${sql}, ${isExpression(coalesceValue) ? coalesceValue.toSQL(ctx, quotedAs) : addValue(ctx.values, coalesceValue)})`;
 	return sql;
 };
-const pushWhereStatementSql = (ctx, table, query, quotedAs) => {
-	const res = whereToSql(ctx, table, query, quotedAs);
+const pushWhereStatementSql = (ctx, table, query, quotedAs, checkIfHasExplicitWhere) => {
+	const res = whereToSql(ctx, table, query, quotedAs, void 0, checkIfHasExplicitWhere);
 	if (res) ctx.sql.push("WHERE", res);
 };
 const pushWhereToSql = (sql, ctx, table, query, quotedAs, parens) => {
 	const res = whereToSql(ctx, table, query, quotedAs, parens);
 	if (res) sql.push(res);
 };
-const whereToSql = (ctx, table, query, quotedAs, parens) => {
+const whereToSql = (ctx, table, query, quotedAs, parens, checkIfHasExplicitWhere) => {
+	let sql;
 	if (query.scopes) {
-		let sql = andOrToSql(ctx, table, query, quotedAs, true);
+		sql = andOrToSql(ctx, table, query, quotedAs, true);
+		if (checkIfHasExplicitWhere && sql) checkIfHasExplicitWhere.value = true;
 		const data = Object.create(query);
 		for (const key in query.scopes) {
 			const scope = query.scopes[key];
@@ -6796,11 +6798,16 @@ const whereToSql = (ctx, table, query, quotedAs, parens) => {
 			data.and = scopeResult.and;
 			data.or = scopeResult.or;
 			const scopeSql = andOrToSql(ctx, table, data, quotedAs, true);
-			if (scopeSql) sql = sql ? sql + " AND " + scopeSql : scopeSql;
+			if (scopeSql) {
+				sql = sql ? sql + " AND " + scopeSql : scopeSql;
+				if (checkIfHasExplicitWhere && key !== "default" && key !== "nonDeleted") checkIfHasExplicitWhere.value = true;
+			}
 		}
-		return sql;
+	} else {
+		sql = andOrToSql(ctx, table, query, quotedAs, parens);
+		if (checkIfHasExplicitWhere && sql) checkIfHasExplicitWhere.value = true;
 	}
-	return andOrToSql(ctx, table, query, quotedAs, parens);
+	return sql;
 };
 const andOrToSql = (ctx, table, query, quotedAs, parens) => {
 	let sql;
@@ -7262,7 +7269,7 @@ const pushUpdateSql = (ctx, query, q, quotedAs, isSubSql) => {
 			if (q.updateMany?.strict) addUpdateManyCteForStrict(ctx, q.updateMany);
 			ctx.sql.push("FROM", updateManyValuesSql);
 		} else if (q.updateFrom) fromWhereSql = pushUpdateFromSql(ctx, query, q, quotedAs, q.updateFrom);
-		pushUpdateWhereSql(ctx, query, q, quotedAs, fromWhereSql);
+		pushUpdateWhereSql(ctx, query, q, quotedAs, updateManyValuesSql || q.updateFrom, fromWhereSql);
 		pushUpdateReturning(ctx, query, q, quotedAs, "RETURNING", relationSelectState, isSubSql);
 	}
 	handleInsertAndUpdateSelectRelationsSqlState(ctx, relationSelectState);
@@ -7301,8 +7308,10 @@ const pushUpdateFromSql = (ctx, query, q, quotedAs, updateFrom) => {
 	}
 	return fromWhereSql;
 };
-const pushUpdateWhereSql = (ctx, query, q, quotedAs, fromWhereSql) => {
-	const mainWhereSql = whereToSql(ctx, query, q, quotedAs);
+const pushUpdateWhereSql = (ctx, query, q, quotedAs, from, fromWhereSql) => {
+	const checkIfHasExplicitWhere = q.all || from ? void 0 : {};
+	const mainWhereSql = whereToSql(ctx, query, q, quotedAs, void 0, checkIfHasExplicitWhere);
+	if (checkIfHasExplicitWhere && !checkIfHasExplicitWhere.value) throw new OrchidOrmInternalError(query, `Dangerous update without conditions`);
 	const whereSql = mainWhereSql ? fromWhereSql ? mainWhereSql + " AND " + fromWhereSql : mainWhereSql : fromWhereSql;
 	if (whereSql) ctx.sql.push("WHERE", whereSql);
 };
@@ -7423,9 +7432,14 @@ const pushDeleteSql = (ctx, query, q, quotedAs, isSubSql) => {
 		if (targets.length) ctx.sql.push(`USING ${targets.join(", ")}`);
 		conditions = ons.join(" AND ");
 	}
-	if (!selectRelations?.movedWhereToCte) pushWhereStatementSql(ctx, query, q, quotedAs);
+	let checkIfHasExplicitWhere;
+	if (!selectRelations?.movedWhereToCte) {
+		checkIfHasExplicitWhere = {};
+		pushWhereStatementSql(ctx, query, q, quotedAs, checkIfHasExplicitWhere);
+	}
 	if (conditions) if (!selectRelations?.movedWhereToCte && (q.and?.length || q.or?.length || q.scopes)) ctx.sql.push("AND", conditions);
 	else ctx.sql.push("WHERE", conditions);
+	else if (!q.all && !checkIfHasExplicitWhere?.value) throw new OrchidOrmInternalError(query, `Dangerous delete without conditions`);
 	if (returning) ctx.sql.push("RETURNING", returning);
 	return makeSql(ctx, "delete", isSubSql);
 };