Fix should_change_user test

blackbeam · Jan 2, 2025 · ff7f896 · ff7f896
1 parent f31373e
commit ff7f896
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -41,13 +41,15 @@ jobs:
       - bash: |
           cargo +nightly build -Zfeatures=dev_dep
           SSL=false COMPRESS=false cargo test
-          SSL=true COMPRESS=false cargo test
+          SSL=true COMPRESS=false cargo test --features native-tls-tls
           SSL=false COMPRESS=true cargo test
-          SSL=true COMPRESS=true cargo test
-          SSL=true COMPRESS=false cargo test --no-default-features --features default-rustls
+          SSL=true COMPRESS=true cargo test --features rustls-tls
 
+          SSL=true COMPRESS=false cargo check --no-default-features --features default-rustls
+          SSL=true COMPRESS=false cargo check --no-default-features --features default-rustls-ring
           SSL=true COMPRESS=false cargo check --no-default-features --features minimal
           SSL=true COMPRESS=false cargo check --no-default-features --features minimal-rust
+          SSL=true COMPRESS=false cargo check --no-default-features --features tracing
         env:
           RUST_BACKTRACE: 1
           DATABASE_URL: mysql://root:root@127.0.0.1:3306/mysql
@@ -82,7 +84,7 @@ jobs:
         displayName: Install Rust (Windows)
       - bash: |
           SSL=false COMPRESS=false cargo test
-          SSL=true COMPRESS=false cargo test
+          SSL=true COMPRESS=false cargo test --features native-tls-tls
           SSL=false COMPRESS=true cargo test
         env:
           RUST_BACKTRACE: 1
@@ -143,7 +145,7 @@ jobs:
           if [[ "5.6" != "$(DB_VERSION)" ]]; then SSL=true; else DATABASE_URL="mysql://root2:password@127.0.0.1/mysql?secure_auth=false"; fi
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL cargo test"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
-          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL cargo test"
+          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL cargo test --features native-tls-tls"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL COMPRESS=true cargo test"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=$SSL COMPRESS=true cargo test --no-default-features --features default-rustls"
         env:
@@ -206,7 +208,7 @@ jobs:
       - bash: |
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL cargo test"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
-          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test"
+          docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --features native-tls-tls"
           docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true COMPRESS=true cargo test"
           if [[ "10.1" != "$(DB_VERSION)" ]]; then docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --no-default-features --features default-rustls"; fi
         env:

diff --git a/src/conn/mod.rs b/src/conn/mod.rs
@@ -1417,7 +1417,7 @@ mod test {
         for (plug, val, pass) in variants {
             dbg!((plug, val, pass, conn.inner.version));
 
-            if plug == "mysql_native_password" && conn.inner.version >= (9, 0, 0) {
+            if plug == "mysql_native_password" && conn.inner.version >= (8, 4, 0) {
                 continue;
             }
 
@@ -1569,7 +1569,7 @@ mod test {
         };
 
         for (i, plugin) in plugins.iter().enumerate() {
-            if *plugin == "mysql_native_password" && conn.server_version() >= (9, 0, 0) {
+            if *plugin == "mysql_native_password" && conn.server_version() >= (8, 4, 0) {
                 continue;
             }