From f770b255f35d4514a6159e8c681e2ffa963e4901 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Tue, 5 Aug 2025 22:11:43 -0700
Subject: [PATCH] Database: Revert syntax for multiline queries

As explicitly documented in `CONTRIBUTING.md`, we are against multiline
template strings. While I see the advantages in readability for the
multiline approach, I'd rather not send extraneous whitespace to the
database.
---
 lib/database.ts | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/database.ts b/lib/database.ts
index f7990a7196..8ac393555a 100644
--- a/lib/database.ts
+++ b/lib/database.ts
@@ -300,11 +300,9 @@ export class DatabaseTable<Row, DB extends Database> {
 	}
 	upsert(partialRow: PartialOrSQL<Row>, partialUpdate = partialRow, where?: SQLStatement) {
 		if (this.db.type === 'pg') {
-			return this.queryExec()`
-				INSERT INTO "${this.name}" (${partialRow as any})
-				ON CONFLICT (${this.primaryKeyName}) DO UPDATE
-				SET ${partialUpdate as any} ${where}
-			`;
+			return this.queryExec(
+			)`INSERT INTO "${this.name}" (${partialRow as any}) ON CONFLICT (${this.primaryKeyName
+			}) DO UPDATE SET ${partialUpdate as any} ${where}`;
 		}
 		return this.queryExec(
 		)`INSERT INTO "${this.name}" (${partialRow as any}) ON DUPLICATE KEY UPDATE ${partialUpdate as any} ${where}`;
@@ -312,10 +310,9 @@ export class DatabaseTable<Row, DB extends Database> {
 	replace(partialRow: PartialOrSQL<Row>, where?: SQLStatement) {
 		if (this.db.type === 'pg') {
 			if (!this.primaryKeyName) throw new Error(`Cannot replace() without a single-column primary key`);
-			return this.queryExec()`
-				INSERT INTO "${this.name}" (${partialRow as any})
-				ON CONFLICT ("${this.primaryKeyName}") DO UPDATE SET ${partialRow as any} ${where}
-			`;
+			return this.queryExec(
+			)`INSERT INTO "${this.name}" (${partialRow as any}) ON CONFLICT ("${this.primaryKeyName
+			}") DO UPDATE SET ${partialRow as any} ${where}`;
 		}
 		return this.queryExec()`REPLACE INTO "${this.name}" (${partialRow as SQLValue}) ${where}`;
 	}