ci test (do not merge)

diesel-rs · Mar 14, 2024 · 012ae9c · 012ae9c
1 parent bc2b4ab
commit 012ae9c
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 42 deletions.
diff --git a/diesel/src/pg/expression/extensions/interval_dsl.rs b/diesel/src/pg/expression/extensions/interval_dsl.rs
@@ -313,31 +313,31 @@ mod tests {
         test_fn!(i64, test_years, years, (i32::MAX / 12) as i64);
     }
 
-    #[test]
-    fn intervals_match_pg_values_f64() {
-        const MAX_DIFF: i64 = 1_000_000;
-        // postgres does not really support intervals with more than i32::MAX microseconds
-        // https://www.postgresql.org/message-id/[email protected]
-        test_fn!(
-            f64,
-            test_microseconds,
-            microseconds,
-            i32::MAX as f64,
-            MAX_DIFF
-        );
-        test_fn!(
-            f64,
-            test_milliseconds,
-            milliseconds,
-            i32::MAX as f64,
-            MAX_DIFF
-        );
-        test_fn!(f64, test_seconds, seconds, i32::MAX as f64, MAX_DIFF);
-        test_fn!(f64, test_minutes, minutes, i32::MAX as f64, MAX_DIFF);
-        test_fn!(f64, test_hours, hours, i32::MAX as f64, MAX_DIFF);
-        test_fn!(f64, test_days, days, i32::MAX as f64, MAX_DIFF);
-        test_fn!(f64, test_weeks, weeks, (i32::MAX / 7) as f64, MAX_DIFF);
-        test_fn!(f64, test_months, months, i32::MAX as f64, MAX_DIFF);
-        test_fn!(f64, test_years, years, (i32::MAX / 12) as f64, MAX_DIFF);
-    }
+    // #[test]
+    // fn intervals_match_pg_values_f64() {
+    //     const MAX_DIFF: i64 = 1_000_000;
+    //     // postgres does not really support intervals with more than i32::MAX microseconds
+    //     // https://www.postgresql.org/message-id/[email protected]
+    //     test_fn!(
+    //         f64,
+    //         test_microseconds,
+    //         microseconds,
+    //         i32::MAX as f64,
+    //         MAX_DIFF
+    //     );
+    //     test_fn!(
+    //         f64,
+    //         test_milliseconds,
+    //         milliseconds,
+    //         i32::MAX as f64,
+    //         MAX_DIFF
+    //     );
+    //     test_fn!(f64, test_seconds, seconds, i32::MAX as f64, MAX_DIFF);
+    //     test_fn!(f64, test_minutes, minutes, i32::MAX as f64, MAX_DIFF);
+    //     test_fn!(f64, test_hours, hours, i32::MAX as f64, MAX_DIFF);
+    //     test_fn!(f64, test_days, days, i32::MAX as f64, MAX_DIFF);
+    //     test_fn!(f64, test_weeks, weeks, (i32::MAX / 7) as f64, MAX_DIFF);
+    //     test_fn!(f64, test_months, months, i32::MAX as f64, MAX_DIFF);
+    //     test_fn!(f64, test_years, years, (i32::MAX / 12) as f64, MAX_DIFF);
+    // }
 }
diff --git a/diesel/src/pg/types/json.rs b/diesel/src/pg/types/json.rs
@@ -46,9 +46,15 @@ impl ToSql<sql_types::Jsonb, Pg> for serde_json::Value {
     }
 }
 
-#[cfg(tests)]
+#[cfg(test)]
 mod tests {
-    use crate::query_builder::bind_types::ByteWrapper;
+    use crate::{
+        deserialize::FromSql,
+        pg::{Pg, PgValue},
+        query_builder::bind_collector::ByteWrapper,
+        serialize::{Output, ToSql},
+        sql_types,
+    };
 
     #[test]
     fn json_to_sql() {

diff --git a/examples/postgres/advanced-blog-cli/src/pagination.rs b/examples/postgres/advanced-blog-cli/src/pagination.rs
@@ -44,7 +44,7 @@ impl<T> Paginated<T> {
     {
         let per_page = self.per_page;
         let results = self.load::<(U, i64)>(conn)?;
-        let total = results.get(0).map(|x| x.1).unwrap_or(0);
+        let total = results.first().map(|x| x.1).unwrap_or(0);
         let records = results.into_iter().map(|x| x.0).collect();
         let total_pages = (total as f64 / per_page as f64).ceil() as i64;
         Ok((records, total_pages))

diff --git a/examples/postgres/advanced-blog-cli/src/schema.rs b/examples/postgres/advanced-blog-cli/src/schema.rs
@@ -37,8 +37,4 @@ diesel::joinable!(comments -> posts (post_id));
 diesel::joinable!(comments -> users (user_id));
 diesel::joinable!(posts -> users (user_id));
 
-diesel::allow_tables_to_appear_in_same_query!(
-    comments,
-    posts,
-    users,
-);
+diesel::allow_tables_to_appear_in_same_query!(comments, posts, users,);
diff --git a/examples/postgres/relations/src/schema.rs b/examples/postgres/relations/src/schema.rs
@@ -34,9 +34,4 @@ diesel::joinable!(books_authors -> authors (author_id));
 diesel::joinable!(books_authors -> books (book_id));
 diesel::joinable!(pages -> books (book_id));
 
-diesel::allow_tables_to_appear_in_same_query!(
-    authors,
-    books,
-    books_authors,
-    pages,
-);
+diesel::allow_tables_to_appear_in_same_query!(authors, books, books_authors, pages,);
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.74.0
+1.65.0