matrix-org · clokep · Jul 26, 2023 · May 3, 2023 · May 3, 2023 · May 3, 2023
diff --git 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
@@ -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 = ?"
 BOOLEAN_COLUMNS = { 
     "access_tokens": ["used"], 
     "account_validity": ["email_sent"], 
     "device_lists_changes_in_room": ["converted_to_destinations"], 
     "device_lists_outbound_pokes": ["sent"], 
     "devices": ["hidden"], 
     "e2e_fallback_keys_json": ["used"], 
     "e2e_room_keys": ["is_verified"], 
     "event_edges": ["is_state"], 
     "events": ["processed", "outlier", "contains_url"], 
     "local_media_repository": ["safe_from_quarantine"], 
     "presence_list": ["accepted"], 
     "presence_stream": ["currently_active"], 
     "public_room_list_stream": ["visibility"], 
     "pushers": ["enabled"], 
     "redactions": ["have_censored"], 
     "room_stats_state": ["is_federatable"], 
     "rooms": ["is_public", "has_auth_chain_index"], 
     "users": ["shadow_banned", "approved"], 
     "un_partial_stated_event_stream": ["rejection_status_changed"], 
     "users_who_share_rooms": ["share_private"], 
     "per_user_experimental_features": ["enabled"], 
 } 
 BOOLEAN_COLUMNS = { 
     "access_tokens": ["used"], 
     "account_validity": ["email_sent"], 
     "device_lists_changes_in_room": ["converted_to_destinations"], 
     "device_lists_outbound_pokes": ["sent"], 
     "devices": ["hidden"], 
     "e2e_fallback_keys_json": ["used"], 
     "e2e_room_keys": ["is_verified"], 
     "event_edges": ["is_state"], 
     "events": ["processed", "outlier", "contains_url"], 
     "local_media_repository": ["safe_from_quarantine"], 
     "presence_list": ["accepted"], 
     "presence_stream": ["currently_active"], 
     "public_room_list_stream": ["visibility"], 
     "pushers": ["enabled"], 
     "redactions": ["have_censored"], 
     "room_stats_state": ["is_federatable"], 
     "rooms": ["is_public", "has_auth_chain_index"], 
     "users": ["shadow_banned", "approved"], 
     "un_partial_stated_event_stream": ["rejection_status_changed"], 
     "users_who_share_rooms": ["share_private"], 
     "per_user_experimental_features": ["enabled"], 
 } 
+                txn.execute(sql, (event.event_id))
 
                 # Update the event_backward_extremities table now that this
                 # event isn't an outlier any more.

@@ -249,12 +249,11 @@ 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

@@ -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())
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Updated all Inline SQL queries using boolean parameters as supported in sqlite 3.27
MadLittleMods marked this conversation as resolved. Show resolved Hide resolved