Bump toolchain to 1.82

diesel-rs · Oct 18, 2024 · 6807582 · 6807582
1 parent 77ca1a3
commit 6807582
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 66 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ concurrency:
 jobs:
   check_and_test:
     name: Check
-    needs: [sqlite_bundled, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
+    #needs: [sqlite_bundled, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
     strategy:
       fail-fast: false
       matrix:
@@ -36,7 +36,7 @@ jobs:
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ runner.os }}-${{ matrix.backend }}-cargo-${{ hashFiles('**/Cargo.toml') }}
+          key: ${{ matrix.os }}-${{ matrix.backend }}-cargo-${{ hashFiles('**/Cargo.toml') }}
 
       - name: Set environment variables
         shell: bash
@@ -80,22 +80,26 @@ jobs:
       - name: Install postgres (MacOS)
         if: matrix.os == 'macos-13' && matrix.backend == 'postgres'
         run: |
-          brew install postgresql@14
-          brew services start postgresql@14
+          brew install postgresql@17
+          brew services start postgresql@17
           sleep 3
-          createuser -s postgres
+          /usr/local/opt/postgresql@17/bin/createuser -s postgres
           echo "PG_DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
           echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres@localhost/diesel_example" >> $GITHUB_ENV
+          echo "PQ_LIB_DIR=/usr/local/opt/postgresql@17/lib" >> $GITHUB_ENV
 
       - name: Install postgres (MacOS M1)
-        if: matrix.os == 'macos-14' && matrix.backend == 'postgres'
+        if: matrix.os == 'macos-15' && matrix.backend == 'postgres'
         run: |
-          brew install postgresql@14
-          brew services start postgresql@14
+          brew install postgresql@17
+          brew services start postgresql@17
           sleep 3
-          createuser -s postgres
+          /opt/homebrew/opt/postgresql@17/bin/createuser -s postgres
+          ls /opt/homebrew/opt/postgresql@17/lib
+          ls /opt/homebrew/opt/postgresql@17/bin
           echo "PG_DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
           echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres@localhost/diesel_example" >> $GITHUB_ENV
+          echo "PQ_LIB_DIR=/opt/homebrew/opt/postgresql@17/lib" >> $GITHUB_ENV
 
       - name: Install sqlite (MacOS)
         if: runner.os == 'macOS' && matrix.backend == 'sqlite'
@@ -107,31 +111,33 @@ jobs:
       - name: Install mysql (MacOS)
         if: matrix.os == 'macos-13' && matrix.backend == 'mysql'
         run: |
-          brew install mariadb@10.11
-          /usr/local/opt/mariadb@10.11/bin/mysql_install_db
-          /usr/local/opt/mariadb@10.11/bin/mysql.server start
+          brew install mariadb@11.5
+          /usr/local/opt/mariadb@11.5/bin/mysql_install_db
+          /usr/local/opt/mariadb@11.5/bin/mysql.server start
           sleep 3
-          /usr/local/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
-          echo "MYSQL_DATABASE_URL=mysql://[email protected]/diesel_test" >> $GITHUB_ENV
-          echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://[email protected]/diesel_example" >> $GITHUB_ENV
-          echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://[email protected]/diesel_unit_test" >> $GITHUB_ENV
-          echo "MYSQLCLIENT_LIB_DIR=/usr/local/opt/[email protected]/lib" >> $GITHUB_ENV
-          echo "MYSQLCLIENT_VERSION=10.11" >> $GITHUB_ENV
+          /usr/local/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; CREATE USER 'diesel'@'localhost' IDENTIFIED BY 'diesel'; grant all on \`diesel_%\`.* to 'diesel'@'localhost';" -urunner
+          /usr/local/opt/[email protected]/bin/mysql -e "CREATE USER 'diesel'@'%' IDENTIFIED BY 'diesel'; grant all on \`diesel_%\`.* to 'diesel'@'%';" -urunner
+          echo "MYSQL_DATABASE_URL=mysql://diesel:[email protected]/diesel_test" >> $GITHUB_ENV
+          echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://diesel:[email protected]/diesel_example" >> $GITHUB_ENV
+          echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://diesel:[email protected]/diesel_unit_test" >> $GITHUB_ENV
+          echo "MYSQLCLIENT_LIB_DIR=/usr/local/opt/[email protected]/lib" >> $GITHUB_ENV
+          echo "MYSQLCLIENT_VERSION=11.5" >> $GITHUB_ENV
 
       - name: Install mysql (MacOS M1)
-        if: matrix.os == 'macos-14' && matrix.backend == 'mysql'
+        if: matrix.os == 'macos-15' && matrix.backend == 'mysql'
         run: |
-          brew install mariadb@10.11
-          ls /opt/homebrew/opt/mariadb@10.11
-          /opt/homebrew/opt/mariadb@10.11/bin/mysql_install_db
-          /opt/homebrew/opt/mariadb@10.11/bin/mysql.server start
+          brew install mariadb@11.5
+          ls /opt/homebrew/opt/mariadb@11.5
+          /opt/homebrew/opt/mariadb@11.5/bin/mysql_install_db
+          /opt/homebrew/opt/mariadb@11.5/bin/mysql.server start
           sleep 3
-          /opt/homebrew/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
-          echo "MYSQL_DATABASE_URL=mysql://[email protected]/diesel_test" >> $GITHUB_ENV
-          echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://[email protected]/diesel_example" >> $GITHUB_ENV
-          echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://[email protected]/diesel_unit_test" >> $GITHUB_ENV
-          echo "MYSQLCLIENT_LIB_DIR=/opt/homebrew/opt/[email protected]/lib" >> $GITHUB_ENV
-          echo "MYSQLCLIENT_VERSION=10.11" >> $GITHUB_ENV
+          /opt/homebrew/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; CREATE USER 'diesel'@'localhost' IDENTIFIED BY 'diesel'; grant all on \`diesel_%\`.* to 'diesel'@'localhost';" -urunner
+          /opt/homebrew/opt/[email protected]/bin/mysql -e "CREATE USER 'diesel'@'%' IDENTIFIED BY 'diesel'; grant all on \`diesel_%\`.* to 'diesel'@'%';" -urunner
+          echo "MYSQL_DATABASE_URL=mysql://diesel:[email protected]/diesel_test" >> $GITHUB_ENV
+          echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://diesel:[email protected]/diesel_example" >> $GITHUB_ENV
+          echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://diesel:[email protected]/diesel_unit_test" >> $GITHUB_ENV
+          echo "MYSQLCLIENT_LIB_DIR=/opt/homebrew/opt/[email protected]/lib" >> $GITHUB_ENV
+          echo "MYSQLCLIENT_VERSION=11.5" >> $GITHUB_ENV
 
       - name: Install sqlite (Windows)
         if: runner.os == 'Windows' && matrix.backend == 'sqlite'

diff --git a/diesel_compile_tests/Cargo.lock b/diesel_compile_tests/Cargo.lock
diff --git a/diesel_compile_tests/tests/fail/auto_type.stderr b/diesel_compile_tests/tests/fail/auto_type.stderr
@@ -29,7 +29,7 @@ error[E0107]: type alias takes 0 generic arguments but 1 generic argument was su
 36 | |         .filter(user_has_post_with_id_greater_than(id_greater_than))
    | |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
    | |_________________|________________________________|
-   |                   |                                help: remove these generics
+   |                   |                                help: remove the unnecessary generics
    |                   expected 0 generic arguments
    |
 note: type alias defined here, with 0 generic parameters

diff --git a/diesel_compile_tests/tests/fail/ensure_sqlite_cannot_access_memory_of_dropped_bind.stderr b/diesel_compile_tests/tests/fail/ensure_sqlite_cannot_access_memory_of_dropped_bind.stderr
@@ -15,6 +15,5 @@ error[E0505]: cannot move out of `buf` because it is borrowed
    |
 help: consider cloning the value if the performance cost is acceptable
    |
-11 -         let query = diesel::select((&buf as &[u8]).into_sql::<sql_types::Binary>());
-11 +         let query = diesel::select((buf.clone() as &[u8]).into_sql::<sql_types::Binary>());
-   |
+11 |         let query = diesel::select((&buf.clone() as &[u8]).into_sql::<sql_types::Binary>());
+   |                                         ++++++++
diff --git a/migrations/mysql/20170805195107_tables_which_make_infer_joinable_blow_up/down.sql b/migrations/mysql/20170805195107_tables_which_make_infer_joinable_blow_up/down.sql
@@ -1,5 +1,4 @@
 DROP TABLE self_referential_fk;
-DROP TABLE fk_doesnt_reference_pk;
 DROP TABLE composite_fk;
 DROP TABLE multiple_fks_to_same_table;
 DROP TABLE cyclic_fk_1 CASCADE;

diff --git a/migrations/mysql/20170805195107_tables_which_make_infer_joinable_blow_up/up.sql b/migrations/mysql/20170805195107_tables_which_make_infer_joinable_blow_up/up.sql
@@ -5,12 +5,6 @@ CREATE TABLE self_referential_fk (
 
 ALTER TABLE self_referential_fk ADD CONSTRAINT self_referential_fk_parent_id_fk FOREIGN KEY (parent_id) REFERENCES self_referential_fk (id);
 
-ALTER TABLE posts ADD CONSTRAINT title_is_unique UNIQUE (title);
-CREATE TABLE fk_doesnt_reference_pk (
-  id INTEGER PRIMARY KEY AUTO_INCREMENT,
-  random VARCHAR(200) REFERENCES posts (title)
-);
-
 CREATE TABLE composite_fk (
   id INTEGER PRIMARY KEY AUTO_INCREMENT,
   post_id INTEGER NOT NULL,

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.81.0
+1.82.0