update: comments related to mysql syntax for db flush

Roardom · Jan 13, 2025 · 636f076 · 636f076
1 parent 2920020
commit 636f076
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/src/scheduler/history_update.rs b/src/scheduler/history_update.rs
@@ -76,9 +76,9 @@ impl Flushable<HistoryUpdate> for super::Batch<Index, HistoryUpdate> {
             "#,
         );
 
-        // Mysql 8.0.20 deprecates use of VALUES() so will have to update it eventually to use aliases instead
         query_builder
-            // .push_values(history_updates., |mut bind, (index, history_update)| {
+            // Trailing space required before the push values function
+            // Leading space required after the push values function
             .push_values(self.iter(), |mut bind, (index, history_update)| {
                 bind.push_bind(index.user_id)
                     .push_bind(index.torrent_id)
@@ -97,6 +97,8 @@ impl Flushable<HistoryUpdate> for super::Batch<Index, HistoryUpdate> {
                     .push_bind(history_update.updated_at)
                     .push_bind(history_update.completed_at);
             })
+            // Mysql 8.0.20 deprecates use of VALUES() so will have to update it eventually to use aliases instead
+            // However, Mariadb doesn't yet support aliases
             .push(
                 r#"
                     ON DUPLICATE KEY UPDATE

diff --git a/src/scheduler/peer_update.rs b/src/scheduler/peer_update.rs
@@ -79,6 +79,8 @@ impl Flushable<PeerUpdate> for super::Batch<Index, PeerUpdate> {
         );
 
         query_builder
+            // Trailing space required before the push values function
+            // Leading space required after the push values function
             .push_values(self.iter(), |mut bind, (index, peer_update)| {
                 bind.push_bind(index.peer_id.to_vec())
                     .push_bind(match peer_update.ip {
@@ -99,6 +101,8 @@ impl Flushable<PeerUpdate> for super::Batch<Index, PeerUpdate> {
                     .push_bind(index.user_id)
                     .push_bind(peer_update.connectable);
             })
+            // Mysql 8.0.20 deprecates use of VALUES() so will have to update it eventually to use aliases instead
+            // However, Mariadb doesn't yet support aliases
             .push(
                 r#"
                 ON DUPLICATE KEY UPDATE

diff --git a/src/scheduler/torrent_update.rs b/src/scheduler/torrent_update.rs
@@ -39,8 +39,6 @@ impl Flushable<TorrentUpdate> for super::Batch<Index, TorrentUpdate> {
 
         let now = Utc::now();
 
-        // Trailing space required before the push values function
-        // Leading space required after the push values function
         let mut query_builder: QueryBuilder<MySql> = QueryBuilder::new(
             r#"
                 INSERT INTO
@@ -65,6 +63,8 @@ impl Flushable<TorrentUpdate> for super::Batch<Index, TorrentUpdate> {
         );
 
         query_builder
+            // Trailing space required before the push values function
+            // Leading space required after the push values function
             .push_values(self.iter(), |mut bind, (index, torrent_update)| {
                 bind.push_bind(index.torrent_id)
                     .push_bind("")
@@ -82,6 +82,8 @@ impl Flushable<TorrentUpdate> for super::Batch<Index, TorrentUpdate> {
                     .push_bind(torrent_update.balance_delta)
                     .push_bind(0);
             })
+            // Mysql 8.0.20 deprecates use of VALUES() so will have to update it eventually to use aliases instead
+            // However, Mariadb doesn't yet support aliases
             .push(
                 r#"
                     ON DUPLICATE KEY UPDATE

diff --git a/src/scheduler/unregistered_info_hash_update.rs b/src/scheduler/unregistered_info_hash_update.rs
@@ -47,6 +47,8 @@ impl Flushable<UnregisteredInfoHashUpdate> for super::Batch<Index, UnregisteredI
         );
 
         query_builder
+            // Trailing space required before the push values function
+            // Leading space required after the push values function
             .push_values(
                 self.iter(),
                 |mut bind, (index, unregistered_info_hash_update)| {
@@ -56,6 +58,8 @@ impl Flushable<UnregisteredInfoHashUpdate> for super::Batch<Index, UnregisteredI
                         .push_bind(unregistered_info_hash_update.updated_at);
                 },
             )
+            // Mysql 8.0.20 deprecates use of VALUES() so will have to update it eventually to use aliases instead
+            // However, Mariadb doesn't yet support aliases
             .push(
                 r#"
                 ON DUPLICATE KEY UPDATE

diff --git a/src/scheduler/user_update.rs b/src/scheduler/user_update.rs
@@ -33,8 +33,6 @@ impl Flushable<UserUpdate> for super::Batch<Index, UserUpdate> {
             return Ok(0);
         }
 
-        // Trailing space required before the push values function
-        // Leading space required after the push values function
         let mut query_builder: QueryBuilder<MySql> = QueryBuilder::new(
             r#"
                 INSERT INTO
@@ -53,6 +51,8 @@ impl Flushable<UserUpdate> for super::Batch<Index, UserUpdate> {
         );
 
         query_builder
+            // Trailing space required before the push values function
+            // Leading space required after the push values function
             .push_values(self.iter(), |mut bind, (index, user_update)| {
                 bind.push_bind(index.user_id)
                     .push_bind("")
@@ -64,6 +64,8 @@ impl Flushable<UserUpdate> for super::Batch<Index, UserUpdate> {
                     .push_bind(user_update.downloaded_delta)
                     .push_bind("");
             })
+            // Mysql 8.0.20 deprecates use of VALUES() so will have to update it eventually to use aliases instead
+            // However, Mariadb doesn't yet support aliases
             .push(
                 r#"
                     ON DUPLICATE KEY UPDATE