Merge pull request #8050 from rust-lang/space-query

Revert "Merge pull request #7941 from eth3lbert/count-subq"
rust-lang · Feb 2, 2024 · 61f3dbd · 61f3dbd
2 parents ec7adbb + b31e33e
commit 61f3dbd
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 325 deletions.
diff --git a/src/controllers/helpers/pagination.rs b/src/controllers/helpers/pagination.rs
@@ -146,18 +146,6 @@ pub(crate) trait Paginate: Sized {
             options,
         }
     }
-
-    fn pages_pagination_with_count_query<C>(
-        self,
-        options: PaginationOptions,
-        count_query: C,
-    ) -> PaginatedQueryWithCountSubq<Self, C> {
-        PaginatedQueryWithCountSubq {
-            query: self,
-            count_query,
-            options,
-        }
-    }
 }
 
 impl<T> Paginate for T {}
@@ -315,61 +303,6 @@ pub(crate) fn decode_seek<D: for<'a> Deserialize<'a>>(seek: &str) -> anyhow::Res
     Ok(decoded)
 }
 
-#[derive(Debug)]
-pub(crate) struct PaginatedQueryWithCountSubq<T, C> {
-    query: T,
-    count_query: C,
-    options: PaginationOptions,
-}
-
-impl<T, C> QueryId for PaginatedQueryWithCountSubq<T, C> {
-    const HAS_STATIC_QUERY_ID: bool = false;
-    type QueryId = ();
-}
-
-impl<
-        T: Query,
-        C: Query + QueryDsl + diesel::query_dsl::methods::SelectDsl<diesel::dsl::CountStar>,
-    > Query for PaginatedQueryWithCountSubq<T, C>
-{
-    type SqlType = (T::SqlType, BigInt);
-}
-
-impl<T, C, DB> RunQueryDsl<DB> for PaginatedQueryWithCountSubq<T, C> {}
-
-impl<T, C> QueryFragment<Pg> for PaginatedQueryWithCountSubq<T, C>
-where
-    T: QueryFragment<Pg>,
-    C: QueryFragment<Pg>,
-{
-    fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Pg>) -> QueryResult<()> {
-        out.push_sql("SELECT *, (");
-        self.count_query.walk_ast(out.reborrow())?;
-        out.push_sql(") FROM (");
-        self.query.walk_ast(out.reborrow())?;
-        out.push_sql(") t LIMIT ");
-        out.push_bind_param::<BigInt, _>(&self.options.per_page)?;
-        if let Some(offset) = self.options.offset() {
-            out.push_sql(format!(" OFFSET {offset}").as_str());
-        }
-        Ok(())
-    }
-}
-
-impl<T, C> PaginatedQueryWithCountSubq<T, C> {
-    pub(crate) fn load<'a, U>(self, conn: &mut PgConnection) -> QueryResult<Paginated<U>>
-    where
-        Self: LoadQuery<'a, PgConnection, WithCount<U>>,
-    {
-        let options = self.options.clone();
-        let records_and_total = self.internal_load(conn)?.collect::<QueryResult<_>>()?;
-        Ok(Paginated {
-            records_and_total,
-            options,
-        })
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;