Fixed test feature call lint, fixed test script, fixed flakey unit test

diesel-rs · Mar 13, 2024 · 23cf90e · 23cf90e
1 parent f8d6fe0
commit 23cf90e
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 10 deletions.
diff --git a/bin/test b/bin/test
@@ -24,22 +24,22 @@ else
     (cd diesel_cli && cargo test --features "sqlite" --no-default-features "$*")
     (cd diesel_migrations && cargo test --features "sqlite diesel/sqlite" "$*")
     (cd diesel_migrations && cargo test --features "sqlite diesel/sqlite" "$*")
-    (cd diesel_derives && cargo test --features "diesel/sqlite" "$*")
+    (cd diesel_derives && cargo test --features "sqlite diesel/sqlite" "$*")
     (cd diesel_tests && cargo test --features "sqlite" --no-default-features "$*")
     (cd diesel_dynamic_schema && cargo test --features "sqlite diesel/sqlite" "$*")
     (cd diesel_bench && cargo test --features "sqlite" --benches "$*")
 
     (cd diesel_migrations && cargo test --features "postgres diesel/postgres" "$*")
     (cd diesel_migrations/migrations_macros && cargo test --features "diesel/postgres postgres" "$*")
-    (cd diesel_derives && cargo test --features "diesel/postgres" "$*")
+    (cd diesel_derives && cargo test --features "postgres diesel/postgres" "$*")
     (cd diesel_cli && cargo test --features "postgres" --no-default-features "$*")
     (cd diesel_tests && cargo test --features "postgres" --no-default-features "$*")
     (cd diesel_dynamic_schema && cargo test --features "postgres diesel/postgres" "$*")
     (cd diesel_bench && cargo test --features "postgres" --benches "$*")
 
     (cd diesel_migrations && cargo test --features "mysql diesel/mysql" "$*" -- --test-threads 1)
     (cd diesel_migrations/migrations_macros && cargo test --features "diesel/mysql mysql" "$*" -- --test-threads 1)
-    (cd diesel_derives && cargo test --features "diesel/mysql" "$*" -- --test-threads 1)
+    (cd diesel_derives && cargo test --features "mysql diesel/mysql" "$*" -- --test-threads 1)
     (cd diesel_cli && cargo test --features "mysql" --no-default-features "$*" -- --test-threads 1)
     (cd diesel_tests && cargo test --features "mysql" --no-default-features "$*" -- --test-threads 1)
     (cd diesel_dynamic_schema && cargo test --features "mysql diesel/mysql" "$*" -- --test-threads 1)

diff --git a/diesel_cli/src/infer_schema_internals/foreign_keys.rs b/diesel_cli/src/infer_schema_internals/foreign_keys.rs
@@ -33,7 +33,7 @@ pub fn remove_unsafe_foreign_keys_for_codegen(
                 "Error loading primary keys for `{}`",
                 fk.parent_table
             ));
-            pk_columns.len() == 1 && Some(&pk_columns[0]) == fk.primary_key_columns.get(0)
+            pk_columns.len() == 1 && Some(&pk_columns[0]) == fk.primary_key_columns.first()
         })
         .filter(|fk| !duplicates.contains(&fk.ordered_tables()))
         .cloned()

diff --git a/diesel_compile_tests/Cargo.lock b/diesel_compile_tests/Cargo.lock
diff --git a/diesel_tests/tests/joins.rs b/diesel_tests/tests/joins.rs
@@ -44,7 +44,8 @@ fn select_single_from_join() {
     let select_title = source.select(posts::title);
 
     let expected_names = vec!["Sean".to_string(), "Tess".to_string()];
-    let actual_names: Vec<String> = select_name.load(connection).unwrap();
+    let mut actual_names: Vec<String> = select_name.load(connection).unwrap();
+    actual_names.sort();
 
     assert_eq!(expected_names, actual_names);
 

diff --git a/examples/mysql/getting_started_step_1/src/schema.rs b/examples/mysql/getting_started_step_1/src/schema.rs
@@ -3,6 +3,7 @@
 diesel::table! {
     posts (id) {
         id -> Integer,
+        #[max_length = 255]
         title -> Varchar,
         body -> Text,
         published -> Bool,

diff --git a/examples/mysql/getting_started_step_2/src/schema.rs b/examples/mysql/getting_started_step_2/src/schema.rs
@@ -3,6 +3,7 @@
 diesel::table! {
     posts (id) {
         id -> Integer,
+        #[max_length = 255]
         title -> Varchar,
         body -> Text,
         published -> Bool,

diff --git a/examples/mysql/getting_started_step_3/src/schema.rs b/examples/mysql/getting_started_step_3/src/schema.rs
@@ -3,6 +3,7 @@
 diesel::table! {
     posts (id) {
         id -> Integer,
+        #[max_length = 255]
         title -> Varchar,
         body -> Text,
         published -> Bool,

diff --git a/examples/postgres/advanced-blog-cli/src/schema.rs b/examples/postgres/advanced-blog-cli/src/schema.rs
@@ -37,4 +37,8 @@ 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,4 +34,9 @@ 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.68.0
+1.74.0