From ad093d3fa8f00a9cb344cece6bb6311c232972e7 Mon Sep 17 00:00:00 2001 From: Kasisnu <5044120+kasisnu@users.noreply.github.com> Date: Tue, 26 Dec 2023 20:01:44 +0530 Subject: [PATCH] explore weights query builder offset --- .../list/list_weights_query_builder.rs | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs index 115af2c33..c3bc0c095 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs @@ -162,13 +162,15 @@ impl ListWeightsQueryBuilder { mysql_pool: &MySqlPool ) -> AnyhowResult> { let query = self.build_query_string(); - //println!("HERE! query: {}", query); - //panic!("query: {:?}", query); let mut query = sqlx::query_as::<_, RawWeightJoinUser>(&query); // NB: The following bindings must match the order of the query builder !! + if let Some(offset) = self.offset { + query = query.bind(offset); + } + if let Some(username) = self.scope_creator_username.as_deref() { query = query.bind(username); } @@ -183,9 +185,6 @@ impl ListWeightsQueryBuilder { query = query.bind(self.limit); - if let Some(offset) = self.offset { - query = query.bind(offset); - } let mut results = query.fetch_all(mysql_pool).await?; @@ -331,18 +330,18 @@ impl ListWeightsQueryBuilder { if sort_ascending { if self.cursor_is_reversed { // NB: We're searching backwards. - query.push_str(" model_weights.id"); + query.push_str(" model_weights.id < ? "); sort_ascending = !sort_ascending; } else { - query.push_str(" model_weights.id"); + query.push_str(" model_weights.id > ? "); } } else { if self.cursor_is_reversed { // NB: We're searching backwards. - query.push_str(" model_weights.id"); + query.push_str(" model_weights.id > ? "); sort_ascending = !sort_ascending; } else { - query.push_str(" model_weights.id"); + query.push_str(" model_weights.id < ? "); } } } @@ -411,10 +410,6 @@ impl ListWeightsQueryBuilder { query.push_str(" LIMIT ?"); } - if let Some(_) = self.offset { - query.push_str(" OFFSET ?"); - } - query } }