From 5cfdae4169234297ac42f33f989ee1bd59a2fbf1 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 3 May 2023 12:46:58 +0530
Subject: [PATCH 01/18] Fixing SQL Query

Fixing that SQLite query according to 3.27.0
---
 synapse/storage/databases/main/purge_events.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index efbd3e75d99e..05ec77409fc0 100644
--- a/synapse/storage/databases/main/purge_events.py
+++ b/synapse/storage/databases/main/purge_events.py
@@ -249,13 +249,12 @@ def _purge_history_txn(
         # Mark all state and own events as outliers
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(
-            "UPDATE events SET outlier = ?"
-            " WHERE event_id IN ("
-            "    SELECT event_id FROM events_to_purge "
-            "    WHERE NOT should_delete"
-            ")",
-            (True,),
-        )
+            "UPDATE events SET outlier = TRUE"
+            "WHERE event_id IN ("
+            "SELECT event_id FROM events_to_purge"
+            "WHERE NOT should_delete"
+            ")"
+            )
 
         # synapse tries to take out an exclusive lock on room_depth whenever it
         # persists events (because upsert), and once we run this update, we

From cd4359aca652bde3d2194326db6756946fcf5d74 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 3 May 2023 12:56:44 +0530
Subject: [PATCH 02/18] Inline SQL queries using boolean parameters #15515

Updated Inline SQL queries according so SQLite 3.27
---
 synapse/storage/databases/main/purge_events.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index 05ec77409fc0..741726724d9e 100644
--- a/synapse/storage/databases/main/purge_events.py
+++ b/synapse/storage/databases/main/purge_events.py
@@ -249,12 +249,12 @@ def _purge_history_txn(
         # Mark all state and own events as outliers
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(
-            "UPDATE events SET outlier = TRUE"
+            "UPDATE events SET outlier = TRUE "
             "WHERE event_id IN ("
-            "SELECT event_id FROM events_to_purge"
-            "WHERE NOT should_delete"
+            "   SELECT event_id FROM events_to_purge "
+            "   WHERE NOT should_delete"
             ")"
-            )
+        )
 
         # synapse tries to take out an exclusive lock on room_depth whenever it
         # persists events (because upsert), and once we run this update, we

From 3857478caaa52b19425e2dae84a22a9a2c7aa5fc Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 3 May 2023 12:57:27 +0530
Subject: [PATCH 03/18] Update purge_events.py

---
 synapse/storage/databases/main/purge_events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index 741726724d9e..c97c6c91013a 100644
--- a/synapse/storage/databases/main/purge_events.py
+++ b/synapse/storage/databases/main/purge_events.py
@@ -249,7 +249,7 @@ def _purge_history_txn(
         # Mark all state and own events as outliers
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(
-            "UPDATE events SET outlier = TRUE "
+            "UPDATE events SET outlier = TRUE"
             "WHERE event_id IN ("
             "   SELECT event_id FROM events_to_purge "
             "   WHERE NOT should_delete"

From 7d6030709a8f5a59eb19d570e4fb9e3cfee45e72 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Mon, 22 May 2023 23:52:47 +0530
Subject: [PATCH 04/18] Updated all Inline SQL queries using boolean parameters
 as supported in sqlite 3.27

Signed-off-by: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
---
 changelog.d/15515.misc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 changelog.d/15515.misc

diff --git a/changelog.d/15515.misc b/changelog.d/15515.misc
new file mode 100644
index 000000000000..e69de29bb2d1

From 36c4012f1f62476659eeec36b72db6918d796538 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Mon, 22 May 2023 23:53:16 +0530
Subject: [PATCH 05/18] Updated all Inline SQL queries using boolean parameters
 as supported in sqlite 3.27 Signed-off-by: Anshul Madnawat
 <100751856+anshulm333@users.noreply.github.com>

---
 changelog.d/15515.misc                         | 1 +
 synapse/storage/databases/main/events.py       | 4 ++--
 synapse/storage/databases/main/purge_events.py | 2 +-
 synapse/storage/databases/main/registration.py | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/changelog.d/15515.misc b/changelog.d/15515.misc
index e69de29bb2d1..963dd7c41665 100644
--- a/changelog.d/15515.misc
+++ b/changelog.d/15515.misc
@@ -0,0 +1 @@
+Updated all Inline SQL queries using boolean parameters as supported in sqlite 3.27
\ No newline at end of file
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py
index e2e6eb479f61..9538af4a20cd 100644
--- a/synapse/storage/databases/main/events.py
+++ b/synapse/storage/databases/main/events.py
@@ -1455,8 +1455,8 @@ def _update_outliers_txn(
                     },
                 )
 
-                sql = "UPDATE events SET outlier = ? WHERE event_id = ?"
-                txn.execute(sql, (False, event.event_id))
+                sql = "UPDATE events SET outlier = False WHERE event_id = ?"
+                txn.execute(sql, (event.event_id))
 
                 # Update the event_backward_extremities table now that this
                 # event isn't an outlier any more.
diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index c97c6c91013a..a39ce64d99f1 100644
--- a/synapse/storage/databases/main/purge_events.py
+++ b/synapse/storage/databases/main/purge_events.py
@@ -249,7 +249,7 @@ def _purge_history_txn(
         # Mark all state and own events as outliers
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(
-            "UPDATE events SET outlier = TRUE"
+            "UPDATE events SET outlier = True"
             "WHERE event_id IN ("
             "   SELECT event_id FROM events_to_purge "
             "   WHERE NOT should_delete"
diff --git a/synapse/storage/databases/main/registration.py b/synapse/storage/databases/main/registration.py
index 676d03bb7e14..14e45e394dfc 100644
--- a/synapse/storage/databases/main/registration.py
+++ b/synapse/storage/databases/main/registration.py
@@ -454,9 +454,9 @@ def select_users_txn(
         ) -> List[Tuple[str, int]]:
             sql = (
                 "SELECT user_id, expiration_ts_ms FROM account_validity"
-                " WHERE email_sent = ? AND (expiration_ts_ms - ?) <= ?"
+                " WHERE email_sent = False AND (expiration_ts_ms - ?) <= ?"
             )
-            values = [False, now_ms, renew_at]
+            values = [now_ms, renew_at]
             txn.execute(sql, values)
             return cast(List[Tuple[str, int]], txn.fetchall())
 

From 8737a24716a222e27e5ff4ece25a135abb225e32 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:55:04 +0530
Subject: [PATCH 06/18] Updated Inline SQL queries using boolean parameters as
 supported in SQLite 3.27

Signed-off-by: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
---
 changelog.d/15515.misc                             | 2 +-
 synapse/storage/databases/main/event_federation.py | 3 +--
 synapse/storage/databases/main/events.py           | 8 ++++----
 synapse/storage/databases/main/push_rule.py        | 6 +++---
 synapse/storage/databases/main/room.py             | 8 ++++----
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/changelog.d/15515.misc b/changelog.d/15515.misc
index 963dd7c41665..991f60f07c2b 100644
--- a/changelog.d/15515.misc
+++ b/changelog.d/15515.misc
@@ -1 +1 @@
-Updated all Inline SQL queries using boolean parameters as supported in sqlite 3.27
\ No newline at end of file
+Updated Inline SQL queries using boolean parameters as supported in SQLite 3.27
\ No newline at end of file
diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py
index 8b6e3c1dc734..2b6ad08b14e7 100644
--- a/synapse/storage/databases/main/event_federation.py
+++ b/synapse/storage/databases/main/event_federation.py
@@ -831,7 +831,7 @@ def get_backfill_points_in_room_txn(
                      * because the schema change is in a background update, it's not
                      * necessarily safe to assume that it will have been completed.
                      */
-                    AND edge.is_state is ? /* False */
+                    AND edge.is_state is False
                     /**
                      * We only want backwards extremities that are older than or at
                      * the same position of the given `current_depth` (where older
@@ -874,7 +874,6 @@ def get_backfill_points_in_room_txn(
                 sql,
                 (
                     room_id,
-                    False,
                     current_depth,
                     self._clock.time_msec(),
                     BACKFILL_EVENT_EXPONENTIAL_BACKOFF_MAXIMUM_DOUBLING_STEPS,
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py
index dd35ffdf10fe..a080a16b02cb 100644
--- a/synapse/storage/databases/main/events.py
+++ b/synapse/storage/databases/main/events.py
@@ -1549,13 +1549,13 @@ def event_dict(event: EventBase) -> JsonDict:
             for event, _ in events_and_contexts
             if not event.internal_metadata.is_redacted()
         ]
-        sql = "UPDATE redactions SET have_censored = ? WHERE "
+        sql = "UPDATE redactions SET have_censored = False WHERE "
         clause, args = make_in_list_sql_clause(
             self.database_engine,
             "redacts",
             unredacted_events,
         )
-        txn.execute(sql + clause, [False] + args)
+        txn.execute(sql + clause, args)
 
         self.db_pool.simple_insert_many_txn(
             txn,
@@ -2318,14 +2318,14 @@ def _update_backward_extremeties(
             "   SELECT 1 FROM events"
             "   LEFT JOIN event_edges edge"
             "   ON edge.event_id = events.event_id"
-            "   WHERE events.event_id = ? AND events.room_id = ? AND (events.outlier = ? OR edge.event_id IS NULL)"
+            "   WHERE events.event_id = ? AND events.room_id = ? AND (events.outlier = False OR edge.event_id IS NULL)"
             " )"
         )
 
         txn.execute_batch(
             query,
             [
-                (e_id, ev.room_id, e_id, ev.room_id, e_id, ev.room_id, False)
+                (e_id, ev.room_id, e_id, ev.room_id, e_id, ev.room_id)
                 for ev in events
                 for e_id in ev.prev_event_ids()
                 if not ev.internal_metadata.is_outlier()
diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py
index e098ceea3cdd..03dc868a89b2 100644
--- a/synapse/storage/databases/main/push_rule.py
+++ b/synapse/storage/databases/main/push_rule.py
@@ -560,19 +560,19 @@ def _upsert_push_rule_txn(
         if isinstance(self.database_engine, PostgresEngine):
             sql = """
                 INSERT INTO push_rules_enable (id, user_name, rule_id, enabled)
-                VALUES (?, ?, ?, ?)
+                VALUES (?, ?, ?, True)
                 ON CONFLICT DO NOTHING
             """
         elif isinstance(self.database_engine, Sqlite3Engine):
             sql = """
                 INSERT OR IGNORE INTO push_rules_enable (id, user_name, rule_id, enabled)
-                VALUES (?, ?, ?, ?)
+                VALUES (?, ?, ?, True)
             """
         else:
             raise RuntimeError("Unknown database engine")
 
         new_enable_id = self._push_rules_enable_id_gen.get_next()
-        txn.execute(sql, (new_enable_id, user_id, rule_id, 1))
+        txn.execute(sql, (new_enable_id, user_id, rule_id))
 
     async def delete_push_rule(self, user_id: str, rule_id: str) -> None:
         """
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
index ca8be8c80d0b..32d7ee39b9b3 100644
--- a/synapse/storage/databases/main/room.py
+++ b/synapse/storage/databases/main/room.py
@@ -936,11 +936,11 @@ def _get_media_mxcs_in_room_txn(
             JOIN event_json USING (room_id, event_id)
             WHERE room_id = ?
                 %(where_clause)s
-                AND contains_url = ? AND outlier = ?
+                AND contains_url = True AND outlier = False
             ORDER BY stream_ordering DESC
             LIMIT ?
         """
-        txn.execute(sql % {"where_clause": ""}, (room_id, True, False, 100))
+        txn.execute(sql % {"where_clause": ""}, (room_id, 100))
 
         local_media_mxcs = []
         remote_media_mxcs = []
@@ -1086,9 +1086,9 @@ def _quarantine_media_txn(
 
         # set quarantine
         if quarantined_by is not None:
-            sql += "AND safe_from_quarantine = ?"
+            sql += "AND safe_from_quarantine = False"
             txn.executemany(
-                sql, [(quarantined_by, media_id, False) for media_id in local_mxcs]
+                sql, [(quarantined_by, media_id) for media_id in local_mxcs]
             )
         # remove from quarantine
         else:

From 7eb4f91a37a0fc6d9a80ea3f77c217cbe4b5fb23 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 21 Jun 2023 18:18:18 +0530
Subject: [PATCH 07/18] Update 15515.misc

Update changelog.d
---
 changelog.d/15515.misc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/15515.misc b/changelog.d/15515.misc
index 991f60f07c2b..a1cf9e6b95ef 100644
--- a/changelog.d/15515.misc
+++ b/changelog.d/15515.misc
@@ -1 +1 @@
-Updated Inline SQL queries using boolean parameters as supported in SQLite 3.27
\ No newline at end of file
+Updated Inline SQL queries using boolean parameters as supported in SQLite 3.27.

From f733e25acd305103871b5ab44be2a16c478f3542 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Fri, 23 Jun 2023 12:19:22 +0530
Subject: [PATCH 08/18] Update event_federation.py

Update event_federation.py to FALSE instead of False
---
 synapse/storage/databases/main/event_federation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/event_federation.py b/synapse/storage/databases/main/event_federation.py
index 2b6ad08b14e7..4fac0e180743 100644
--- a/synapse/storage/databases/main/event_federation.py
+++ b/synapse/storage/databases/main/event_federation.py
@@ -831,7 +831,7 @@ def get_backfill_points_in_room_txn(
                      * because the schema change is in a background update, it's not
                      * necessarily safe to assume that it will have been completed.
                      */
-                    AND edge.is_state is False
+                    AND edge.is_state is FALSE
                     /**
                      * We only want backwards extremities that are older than or at
                      * the same position of the given `current_depth` (where older

From 7ae7fefec249049bf77472ec7bfdb04aef25bd90 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Fri, 23 Jun 2023 12:22:46 +0530
Subject: [PATCH 09/18] Update stream.py

Updated event.outlier to False
---
 synapse/storage/databases/main/stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py
index 92cbe262a6c9..0e83bc3a3468 100644
--- a/synapse/storage/databases/main/stream.py
+++ b/synapse/storage/databases/main/stream.py
@@ -1475,7 +1475,7 @@ def _paginate_room_events_txn(
                 event.topological_ordering, event.stream_ordering
             FROM events AS event
             %(join_clause)s
-            WHERE event.outlier = ? AND event.room_id = ? AND %(bounds)s
+            WHERE event.outlier = False AND event.room_id = ? AND %(bounds)s
             ORDER BY event.topological_ordering %(order)s,
             event.stream_ordering %(order)s LIMIT ?
         """ % {

From 97f337b4a658b21e79f41a130096a9f909d84732 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:43:37 +0530
Subject: [PATCH 10/18] Updated Inline SQL queries using boolean parameters as
 supported in SQLite 3.27.

Signed-off-by: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
---
 synapse/storage/databases/main/events.py       | 6 +++---
 synapse/storage/databases/main/purge_events.py | 2 +-
 synapse/storage/databases/main/push_rule.py    | 4 ++--
 synapse/storage/databases/main/registration.py | 2 +-
 synapse/storage/databases/main/room.py         | 4 ++--
 synapse/storage/databases/main/stream.py       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py
index a080a16b02cb..ffd9c40d3a79 100644
--- a/synapse/storage/databases/main/events.py
+++ b/synapse/storage/databases/main/events.py
@@ -1455,7 +1455,7 @@ def _update_outliers_txn(
                     },
                 )
 
-                sql = "UPDATE events SET outlier = False WHERE event_id = ?"
+                sql = "UPDATE events SET outlier = FALSE WHERE event_id = ?"
                 txn.execute(sql, (event.event_id))
 
                 # Update the event_backward_extremities table now that this
@@ -1549,7 +1549,7 @@ def event_dict(event: EventBase) -> JsonDict:
             for event, _ in events_and_contexts
             if not event.internal_metadata.is_redacted()
         ]
-        sql = "UPDATE redactions SET have_censored = False WHERE "
+        sql = "UPDATE redactions SET have_censored = FALSE WHERE "
         clause, args = make_in_list_sql_clause(
             self.database_engine,
             "redacts",
@@ -2318,7 +2318,7 @@ def _update_backward_extremeties(
             "   SELECT 1 FROM events"
             "   LEFT JOIN event_edges edge"
             "   ON edge.event_id = events.event_id"
-            "   WHERE events.event_id = ? AND events.room_id = ? AND (events.outlier = False OR edge.event_id IS NULL)"
+            "   WHERE events.event_id = ? AND events.room_id = ? AND (events.outlier = FALSE OR edge.event_id IS NULL)"
             " )"
         )
 
diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index 941040b90499..bfbb5bac09f1 100644
--- a/synapse/storage/databases/main/purge_events.py
+++ b/synapse/storage/databases/main/purge_events.py
@@ -249,7 +249,7 @@ def _purge_history_txn(
         # Mark all state and own events as outliers
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(
-            "UPDATE events SET outlier = True"
+            "UPDATE events SET outlier = TRUE"
             "WHERE event_id IN ("
             "   SELECT event_id FROM events_to_purge "
             "   WHERE NOT should_delete"
diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py
index 03dc868a89b2..5097bbc6b0e6 100644
--- a/synapse/storage/databases/main/push_rule.py
+++ b/synapse/storage/databases/main/push_rule.py
@@ -560,13 +560,13 @@ def _upsert_push_rule_txn(
         if isinstance(self.database_engine, PostgresEngine):
             sql = """
                 INSERT INTO push_rules_enable (id, user_name, rule_id, enabled)
-                VALUES (?, ?, ?, True)
+                VALUES (?, ?, ?, TRUE)
                 ON CONFLICT DO NOTHING
             """
         elif isinstance(self.database_engine, Sqlite3Engine):
             sql = """
                 INSERT OR IGNORE INTO push_rules_enable (id, user_name, rule_id, enabled)
-                VALUES (?, ?, ?, True)
+                VALUES (?, ?, ?, TRUE)
             """
         else:
             raise RuntimeError("Unknown database engine")
diff --git a/synapse/storage/databases/main/registration.py b/synapse/storage/databases/main/registration.py
index 14e45e394dfc..c582cf05732d 100644
--- a/synapse/storage/databases/main/registration.py
+++ b/synapse/storage/databases/main/registration.py
@@ -454,7 +454,7 @@ def select_users_txn(
         ) -> List[Tuple[str, int]]:
             sql = (
                 "SELECT user_id, expiration_ts_ms FROM account_validity"
-                " WHERE email_sent = False AND (expiration_ts_ms - ?) <= ?"
+                " WHERE email_sent = FALSE AND (expiration_ts_ms - ?) <= ?"
             )
             values = [now_ms, renew_at]
             txn.execute(sql, values)
diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
index 32d7ee39b9b3..203392b36e92 100644
--- a/synapse/storage/databases/main/room.py
+++ b/synapse/storage/databases/main/room.py
@@ -936,7 +936,7 @@ def _get_media_mxcs_in_room_txn(
             JOIN event_json USING (room_id, event_id)
             WHERE room_id = ?
                 %(where_clause)s
-                AND contains_url = True AND outlier = False
+                AND contains_url = TRUE AND outlier = FALSE
             ORDER BY stream_ordering DESC
             LIMIT ?
         """
@@ -1086,7 +1086,7 @@ def _quarantine_media_txn(
 
         # set quarantine
         if quarantined_by is not None:
-            sql += "AND safe_from_quarantine = False"
+            sql += "AND safe_from_quarantine = FALSE"
             txn.executemany(
                 sql, [(quarantined_by, media_id) for media_id in local_mxcs]
             )
diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py
index 0e83bc3a3468..c27916d55d4f 100644
--- a/synapse/storage/databases/main/stream.py
+++ b/synapse/storage/databases/main/stream.py
@@ -1475,7 +1475,7 @@ def _paginate_room_events_txn(
                 event.topological_ordering, event.stream_ordering
             FROM events AS event
             %(join_clause)s
-            WHERE event.outlier = False AND event.room_id = ? AND %(bounds)s
+            WHERE event.outlier = FALSE AND event.room_id = ? AND %(bounds)s
             ORDER BY event.topological_ordering %(order)s,
             event.stream_ordering %(order)s LIMIT ?
         """ % {

From 19e15c33f84dca9e0e8be15ef59caaa456cc8218 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <madlittlemods@gmail.com>
Date: Wed, 5 Jul 2023 16:59:25 -0500
Subject: [PATCH 11/18] Update changelog.d/15515.misc

---
 changelog.d/15515.misc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/15515.misc b/changelog.d/15515.misc
index a1cf9e6b95ef..67ab0cf62f45 100644
--- a/changelog.d/15515.misc
+++ b/changelog.d/15515.misc
@@ -1 +1 @@
-Updated Inline SQL queries using boolean parameters as supported in SQLite 3.27.
+Update SQL queries to inline boolean parameters as supported in SQLite 3.27.

From 32d8dd40ffc6d1e433604aef2764006150a87d27 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Thu, 6 Jul 2023 10:49:12 +0530
Subject: [PATCH 12/18] Rename 15515.misc to 15525.misc

---
 changelog.d/{15515.misc => 15525.misc} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename changelog.d/{15515.misc => 15525.misc} (100%)

diff --git a/changelog.d/15515.misc b/changelog.d/15525.misc
similarity index 100%
rename from changelog.d/15515.misc
rename to changelog.d/15525.misc

From e871524c2dd8b12ff8b09035829ac967b1dc88ab Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Fri, 7 Jul 2023 00:09:25 +0530
Subject: [PATCH 13/18] Update stream.py

Signed-off-by: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
---
 synapse/storage/databases/main/stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py
index c27916d55d4f..5b39e3484329 100644
--- a/synapse/storage/databases/main/stream.py
+++ b/synapse/storage/databases/main/stream.py
@@ -1401,7 +1401,7 @@ def _paginate_room_events_txn(
             `to_token`), or `limit` is zero.
         """
 
-        args = [False, room_id]
+        args = [room_id]
 
         order, from_bound, to_bound = generate_pagination_bounds(
             direction, from_token, to_token

From 3e7c901482a7a5db00a2d0e578243b8d14f42aa7 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:18:42 +0530
Subject: [PATCH 14/18] Update synapse/storage/databases/main/purge_events.py

Co-authored-by: Eric Eastwood <madlittlemods@gmail.com>
---
 synapse/storage/databases/main/purge_events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/purge_events.py b/synapse/storage/databases/main/purge_events.py
index bfbb5bac09f1..b52f48cf0444 100644
--- a/synapse/storage/databases/main/purge_events.py
+++ b/synapse/storage/databases/main/purge_events.py
@@ -250,7 +250,7 @@ def _purge_history_txn(
         logger.info("[purge] marking remaining events as outliers")
         txn.execute(
             "UPDATE events SET outlier = TRUE"
-            "WHERE event_id IN ("
+            " WHERE event_id IN ("
             "   SELECT event_id FROM events_to_purge "
             "   WHERE NOT should_delete"
             ")"

From 66b8ab0f7df157790389c92bc1b011ae4379d319 Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Sat, 8 Jul 2023 01:44:00 +0530
Subject: [PATCH 15/18] Update synapse/storage/databases/main/stream.py

Co-authored-by: Eric Eastwood <madlittlemods@gmail.com>
---
 synapse/storage/databases/main/stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py
index 5b39e3484329..5a3611c41518 100644
--- a/synapse/storage/databases/main/stream.py
+++ b/synapse/storage/databases/main/stream.py
@@ -1401,7 +1401,7 @@ def _paginate_room_events_txn(
             `to_token`), or `limit` is zero.
         """
 
-        args = [room_id]
+        args: List[Any] = [room_id]
 
         order, from_bound, to_bound = generate_pagination_bounds(
             direction, from_token, to_token

From ea1fbfc5286380026d33731a7e35bd3a929e4c7d Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 12 Jul 2023 09:21:07 +0530
Subject: [PATCH 16/18] Update synapse/storage/databases/main/events.py

Co-authored-by: Eric Eastwood <madlittlemods@gmail.com>
---
 synapse/storage/databases/main/events.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py
index bf04c859ee3f..bd3f14fb7126 100644
--- a/synapse/storage/databases/main/events.py
+++ b/synapse/storage/databases/main/events.py
@@ -1456,7 +1456,7 @@ def _update_outliers_txn(
                 )
 
                 sql = "UPDATE events SET outlier = FALSE WHERE event_id = ?"
-                txn.execute(sql, (event.event_id))
+                txn.execute(sql, (event.event_id,))
 
                 # Update the event_backward_extremities table now that this
                 # event isn't an outlier any more.

From aaa1ad29bd1099f9dfa5c8b13dad1d661044435c Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Sun, 23 Jul 2023 17:59:14 +0530
Subject: [PATCH 17/18] Updated push_rule.py Signed-off-by: Anshul Madnawat
 <100751856+anshulm333@users.noreply.github.com>

---
 synapse/storage/databases/main/push_rule.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/storage/databases/main/push_rule.py b/synapse/storage/databases/main/push_rule.py
index 5097bbc6b0e6..c13c0bc7d725 100644
--- a/synapse/storage/databases/main/push_rule.py
+++ b/synapse/storage/databases/main/push_rule.py
@@ -560,13 +560,13 @@ def _upsert_push_rule_txn(
         if isinstance(self.database_engine, PostgresEngine):
             sql = """
                 INSERT INTO push_rules_enable (id, user_name, rule_id, enabled)
-                VALUES (?, ?, ?, TRUE)
+                VALUES (?, ?, ?, 1)
                 ON CONFLICT DO NOTHING
             """
         elif isinstance(self.database_engine, Sqlite3Engine):
             sql = """
                 INSERT OR IGNORE INTO push_rules_enable (id, user_name, rule_id, enabled)
-                VALUES (?, ?, ?, TRUE)
+                VALUES (?, ?, ?, 1)
             """
         else:
             raise RuntimeError("Unknown database engine")

From b9e505a3557fd6b3458cf9b1dc775328b44f887f Mon Sep 17 00:00:00 2001
From: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
Date: Wed, 26 Jul 2023 19:54:16 +0530
Subject: [PATCH 18/18] Update room.py

Signed-off-by: Anshul Madnawat <100751856+anshulm333@users.noreply.github.com>
---
 synapse/storage/databases/main/room.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py
index e210635c4faa..719e11aea61d 100644
--- a/synapse/storage/databases/main/room.py
+++ b/synapse/storage/databases/main/room.py
@@ -976,7 +976,7 @@ def _get_media_mxcs_in_room_txn(
 
             txn.execute(
                 sql % {"where_clause": "AND stream_ordering < ?"},
-                (room_id, next_token, True, False, 100),
+                (room_id, next_token, 100),
             )
 
         return local_media_mxcs, remote_media_mxcs