refactor: replace OR with IN operator

mrjackwills · May 18, 2024 · 45c3b7d · 45c3b7d
1 parent 23589a8
commit 45c3b7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/src/database/postgres/models/user.rs b/src/database/postgres/models/user.rs
@@ -309,8 +309,7 @@ WHERE
 DELETE FROM
 	registered_user_audit
 WHERE
-	(old_values -> 'registered_user_id')::BIGINT = $1
-	OR (new_values -> 'registered_user_id')::BIGINT = $1";
+	$1 IN ((old_values -> 'registered_user_id')::BIGINT, (new_values -> 'registered_user_id')::BIGINT)";
         sqlx::query(user_audit_query)
             .bind(self.registered_user_id.get())
             .execute(&mut *transaction)
@@ -319,8 +318,7 @@ WHERE
 DELETE FROM
 	device_audit
 WHERE
-	(old_values -> 'registered_user_id')::BIGINT = $1
-	OR (new_values -> 'registered_user_id')::BIGINT = $1";
+	$1 IN ((old_values -> 'registered_user_id')::BIGINT, (new_values -> 'registered_user_id')::BIGINT)";
         sqlx::query(device_audit)
             .bind(self.registered_user_id.get())
             .execute(&mut *transaction)
@@ -329,8 +327,7 @@ WHERE
 DELETE FROM
 	api_key_audit
 WHERE
-	(old_values -> 'registered_user_id')::BIGINT = $1
-	OR (new_values -> 'registered_user_id')::BIGINT = $1";
+	$1 IN ((old_values -> 'registered_user_id')::BIGINT, (new_values -> 'registered_user_id')::BIGINT)";
         sqlx::query(api_key_audit)
             .bind(self.registered_user_id.get())
             .execute(&mut *transaction)
@@ -339,8 +336,7 @@ WHERE
 DELETE FROM
 	two_fa_secret_audit
 WHERE
-	(old_values -> 'registered_user_id')::BIGINT = $1
-	OR (new_values -> 'registered_user_id')::BIGINT = $1";
+	$1 IN ((old_values -> 'registered_user_id')::BIGINT, (new_values -> 'registered_user_id')::BIGINT)";
         sqlx::query(two_fa_secret_audit)
             .bind(self.registered_user_id.get())
             .execute(&mut *transaction)
@@ -349,8 +345,7 @@ WHERE
 DELETE FROM
 	two_fa_backup_audit
 WHERE
-	(old_values -> 'registered_user_id')::BIGINT = $1
-	OR (new_values -> 'registered_user_id')::BIGINT = $1";
+	$1 IN ((old_values -> 'registered_user_id')::BIGINT, (new_values -> 'registered_user_id')::BIGINT)";
         sqlx::query(two_fa_backup_audit)
             .bind(self.registered_user_id.get())
             .execute(&mut *transaction)

diff --git a/src/servers/mod.rs b/src/servers/mod.rs
@@ -503,15 +503,15 @@ pub mod test_setup {
 
         /// Remove test user from postgres
         pub async fn delete_test_users(&self) {
-            let query = r"DELETE FROM registered_user WHERE full_name = $1 OR full_name = $2;";
+            let query = r"DELETE FROM registered_user WHERE full_name IN ($1, $2);";
             sqlx::query(query)
                 .bind(ANON_FULL_NAME)
                 .bind(TEST_FULL_NAME)
                 .execute(&self.postgres)
                 .await
                 .unwrap();
 
-            let query = r"DELETE FROM email_address WHERE email = $1 OR EMAIL = $2;";
+            let query = r"DELETE FROM email_address WHERE email IN ($1, $2);";
             sqlx::query(query)
                 .bind(TEST_EMAIL)
                 .bind(ANON_EMAIL)