[misc] MySQL 8 test correction

mariadb-corporation · Jan 29, 2021 · 61c2105 · 61c2105
1 parent ee71dd4
commit 61c2105
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/.travis/sql/dbinit.sql b/.travis/sql/dbinit.sql
@@ -5,10 +5,10 @@ CREATE USER 'bob'@'%';
 GRANT ALL ON *.* TO 'bob'@'%' with grant option;
 
 CREATE USER 'boby'@'%' identified by 'hey';
-GRANT ALL ON *.* TO 'boby'@'%' /*M!100401 identified by 'hey' with grant option*/ ;
+GRANT ALL ON *.* TO 'boby'@'%' /*M!100401 identified by 'hey' */ with grant option;
 
 CREATE USER 'boby'@'localhost' identified by 'hey';
-GRANT ALL ON *.* TO 'boby'@'localhost' /*M!100401 identified by 'hey' with grant option*/ ;
+GRANT ALL ON *.* TO 'boby'@'localhost' /*M!100401 identified by 'hey' */ with grant option;
 
 FLUSH PRIVILEGES;
 

diff --git a/src/main/java/org/mariadb/jdbc/MariaDbDatabaseMetaData.java b/src/main/java/org/mariadb/jdbc/MariaDbDatabaseMetaData.java
@@ -1068,7 +1068,8 @@ public ResultSet getBestRowIdentifier(
       throw new SQLException("'table' parameter cannot be null in getBestRowIdentifier()");
     }
 
-    boolean hasIsGeneratedCol = (connection.isServerMariaDb() && connection.versionGreaterOrEqual(10, 2, 0));
+    boolean hasIsGeneratedCol =
+        (connection.isServerMariaDb() && connection.versionGreaterOrEqual(10, 2, 0));
 
     String sql =
         "SELECT "

diff --git a/src/test/java/org/mariadb/jdbc/StoredProcedureTest.java b/src/test/java/org/mariadb/jdbc/StoredProcedureTest.java
@@ -582,16 +582,22 @@ public void testMetaCatalogNoAccessToProcedureBodies() throws Exception {
     Statement statement = sharedConnection.createStatement();
     statement.execute("DROP USER IF EXISTS 'test_jdbc'@'%'");
     statement.execute("DROP USER IF EXISTS 'test_jdbc'@'localhost'");
-    statement.execute("CREATE USER 'test_jdbc'@'localhost' IDENTIFIED BY 'testJ@dc1'");
+    statement.execute(
+        "CREATE USER 'test_jdbc'@'localhost' IDENTIFIED /*!80000 WITH mysql_native_password */ BY 'testJ@dc1'");
     statement.execute(
         "GRANT ALL ON "
             + database
-            + ".* TO 'test_jdbc'@'localhost' IDENTIFIED BY 'testJ@dc1' WITH GRANT OPTION");
-    statement.execute("CREATE USER 'test_jdbc'@'%' IDENTIFIED BY 'testJ@dc1'");
+            + ".* TO 'test_jdbc'@'localhost' "
+            + ((isMariadbServer() || !minVersion(8, 0)) ? " IDENTIFIED BY 'testJ@dc1' " : "")
+            + " WITH GRANT OPTION");
+    statement.execute(
+        "CREATE USER 'test_jdbc'@'%' IDENTIFIED /*!80000 WITH mysql_native_password */ BY 'testJ@dc1'");
     statement.execute(
         "GRANT ALL ON "
             + database
-            + ".* TO 'test_jdbc'@'%' IDENTIFIED BY 'testJ@dc1' WITH GRANT OPTION");
+            + ".* TO 'test_jdbc'@'%' "
+            + ((isMariadbServer() || !minVersion(8, 0)) ? " IDENTIFIED BY 'testJ@dc1' " : "")
+            + " WITH GRANT OPTION");
     statement.execute("FLUSH PRIVILEGES");
     Properties properties = new Properties();
     properties.put("user", "test_jdbc");