misc - ensure test cleanup

ensure test cleanup before/after running test, mostly for existing server instance test multiple run
mariadb-corporation · May 11, 2021 · 6bffa7b · 6bffa7b
1 parent 1547321
commit 6bffa7b
Show file tree

Hide file tree

Showing 57 changed files with 200 additions and 179 deletions.
diff --git a/src/main/java/org/mariadb/jdbc/MariaDbConnection.java b/src/main/java/org/mariadb/jdbc/MariaDbConnection.java
@@ -52,7 +52,6 @@
 
 package org.mariadb.jdbc;
 
-import java.io.File;
 import java.net.SocketException;
 import java.sql.*;
 import java.util.HashMap;
@@ -516,10 +515,11 @@ public CallableParameterMetaData getInternalParameterMetaData(
     PreparedStatement prep =
         new ClientSidePreparedStatement(
             this,
-            "SELECT * from information_schema.PARAMETERS " +
-                    "WHERE SPECIFIC_NAME = ? " +
-                    "AND SPECIFIC_SCHEMA = " + (databaseName != null ?  "?" : "DATABASE()") +
-                    " ORDER BY ORDINAL_POSITION",
+            "SELECT * from information_schema.PARAMETERS "
+                + "WHERE SPECIFIC_NAME = ? "
+                + "AND SPECIFIC_SCHEMA = "
+                + (databaseName != null ? "?" : "DATABASE()")
+                + " ORDER BY ORDINAL_POSITION",
             ResultSet.TYPE_FORWARD_ONLY,
             ResultSet.CONCUR_READ_ONLY,
             Statement.NO_GENERATED_KEYS,

diff --git a/...main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java b/...main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java
@@ -52,11 +52,6 @@
 
 package org.mariadb.jdbc.internal.com.read.resultset.rowprotocol;
 
-import org.mariadb.jdbc.internal.ColumnType;
-import org.mariadb.jdbc.internal.com.read.resultset.ColumnDefinition;
-import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
-import org.mariadb.jdbc.util.Options;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -66,6 +61,10 @@
 import java.time.format.DateTimeParseException;
 import java.util.Calendar;
 import java.util.TimeZone;
+import org.mariadb.jdbc.internal.ColumnType;
+import org.mariadb.jdbc.internal.com.read.resultset.ColumnDefinition;
+import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
+import org.mariadb.jdbc.util.Options;
 
 public class BinaryRowProtocol extends RowProtocol {
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/Utils.java b/src/main/java/org/mariadb/jdbc/internal/util/Utils.java
@@ -1019,7 +1019,7 @@ public static boolean validateFileName(
     if (parameters != null) {
       pattern =
           Pattern.compile(
-              "^(\\s*\\/\\*([^\\*]|\\*[^\\/])*\\*\\/)*\\s*LOAD\\s+DATA\\s+((LOW_PRIORITY|CONCURRENT)\\s+)?LOCAL\\s+INFILE\\s+\\?",
+              "^(\\s*\\/\\*([^\\*]|\\*[^\\/])*\\*\\/)*\\s*LOAD\\s+(DATA|XML)\\s+((LOW_PRIORITY|CONCURRENT)\\s+)?LOCAL\\s+INFILE\\s+\\?",
               Pattern.CASE_INSENSITIVE);
       if (pattern.matcher(sql).find() && parameters.length > 0) {
         return parameters[0].toString().toLowerCase().equals("'" + fileName.toLowerCase() + "'");

diff --git a/src/test/java/org/mariadb/jdbc/AllowMultiQueriesTest.java b/src/test/java/org/mariadb/jdbc/AllowMultiQueriesTest.java
@@ -71,6 +71,7 @@ public class AllowMultiQueriesTest extends BaseTest {
    */
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE AllowMultiQueriesTest(id int not null primary key auto_increment, test varchar(10))");
@@ -83,10 +84,10 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE AllowMultiQueriesTest");
-      stmt.execute("DROP TABLE AllowMultiQueriesTest2");
+      stmt.execute("DROP TABLE IF EXISTS AllowMultiQueriesTest");
+      stmt.execute("DROP TABLE IF EXISTS AllowMultiQueriesTest2");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/BasicBatchTest.java b/src/test/java/org/mariadb/jdbc/BasicBatchTest.java
@@ -69,6 +69,7 @@ public class BasicBatchTest extends BaseTest {
    */
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE test_batch(id int not null primary key auto_increment, test varchar(10))");
@@ -88,17 +89,17 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE test_batch");
-      stmt.execute("DROP TABLE test_batch2");
-      stmt.execute("DROP TABLE test_batch3");
-      stmt.execute("DROP TABLE batchUpdateException");
-      stmt.execute("DROP TABLE batchPrepareUpdateException");
-      stmt.execute("DROP TABLE rewritetest");
-      stmt.execute("DROP TABLE rewritetest2");
-      stmt.execute("DROP TABLE bug501452");
-      stmt.execute("DROP TABLE testBatchString");
+      stmt.execute("DROP TABLE IF EXISTS test_batch");
+      stmt.execute("DROP TABLE IF EXISTS test_batch2");
+      stmt.execute("DROP TABLE IF EXISTS test_batch3");
+      stmt.execute("DROP TABLE IF EXISTS batchUpdateException");
+      stmt.execute("DROP TABLE IF EXISTS batchPrepareUpdateException");
+      stmt.execute("DROP TABLE IF EXISTS rewritetest");
+      stmt.execute("DROP TABLE IF EXISTS rewritetest2");
+      stmt.execute("DROP TABLE IF EXISTS bug501452");
+      stmt.execute("DROP TABLE IF EXISTS testBatchString");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/BigQueryTest.java b/src/test/java/org/mariadb/jdbc/BigQueryTest.java
@@ -72,6 +72,7 @@ public class BigQueryTest extends BaseTest {
    */
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE bigblob(id int not null primary key auto_increment, test longblob)");
@@ -89,14 +90,14 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE bigblob");
-      stmt.execute("DROP TABLE bigblob2");
-      stmt.execute("DROP TABLE bigblob3");
-      stmt.execute("DROP TABLE bigblob4");
-      stmt.execute("DROP TABLE bigblob5");
-      stmt.execute("DROP TABLE bigblob6");
+      stmt.execute("DROP TABLE IF EXISTS bigblob");
+      stmt.execute("DROP TABLE IF EXISTS bigblob2");
+      stmt.execute("DROP TABLE IF EXISTS bigblob3");
+      stmt.execute("DROP TABLE IF EXISTS bigblob4");
+      stmt.execute("DROP TABLE IF EXISTS bigblob5");
+      stmt.execute("DROP TABLE IF EXISTS bigblob6");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/BlobTest.java b/src/test/java/org/mariadb/jdbc/BlobTest.java
@@ -75,6 +75,7 @@ public class BlobTest extends BaseTest {
    */
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE bug716378(id int not null primary key auto_increment, test longblob, test2 blob, test3 text)");
@@ -101,20 +102,20 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE bug716378");
-      stmt.execute("DROP TABLE BlobTeststreamtest2");
-      stmt.execute("DROP TABLE BlobTeststreamtest3");
-      stmt.execute("DROP TABLE BlobTestclobtest");
-      stmt.execute("DROP TABLE BlobTestclobtest2");
-      stmt.execute("DROP TABLE BlobTestclobtest3");
-      stmt.execute("DROP TABLE BlobTestclobtest4");
-      stmt.execute("DROP TABLE BlobTestclobtest5");
-      stmt.execute("DROP TABLE BlobTestblobtest");
-      stmt.execute("DROP TABLE BlobTestblobtest2");
-      stmt.execute("DROP TABLE conj77_test");
-      stmt.execute("DROP TABLE emptyBlob");
+      stmt.execute("DROP TABLE IF EXISTS bug716378");
+      stmt.execute("DROP TABLE IF EXISTS BlobTeststreamtest2");
+      stmt.execute("DROP TABLE IF EXISTS BlobTeststreamtest3");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest2");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest3");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest4");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest5");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestblobtest");
+      stmt.execute("DROP TABLE IF EXISTS BlobTestblobtest2");
+      stmt.execute("DROP TABLE IF EXISTS conj77_test");
+      stmt.execute("DROP TABLE IF EXISTS emptyBlob");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/BooleanTest.java b/src/test/java/org/mariadb/jdbc/BooleanTest.java
@@ -68,6 +68,7 @@ public class BooleanTest extends BaseTest {
    */
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE booleantest(id int not null primary key auto_increment, test boolean)");
@@ -80,11 +81,11 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE booleantest");
-      stmt.execute("DROP TABLE booleanvalue");
-      stmt.execute("DROP TABLE booleanAllField");
+      stmt.execute("DROP TABLE IF EXISTS booleantest");
+      stmt.execute("DROP TABLE IF EXISTS booleanvalue");
+      stmt.execute("DROP TABLE IF EXISTS booleanAllField");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/BufferTest.java b/src/test/java/org/mariadb/jdbc/BufferTest.java
@@ -83,15 +83,15 @@ public class BufferTest extends BaseTest {
 
   @BeforeClass()
   public static void initClass() throws SQLException {
-    afterClass();
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("CREATE TABLE buffer_test(test longText)");
       stmt.execute("FLUSH TABLES");
     }
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("DROP TABLE IF EXISTS buffer_test");
     }

diff --git a/src/test/java/org/mariadb/jdbc/ByteTest.java b/src/test/java/org/mariadb/jdbc/ByteTest.java
@@ -65,16 +65,17 @@ public class ByteTest extends BaseTest {
 
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("CREATE TABLE ByteTest(test tinyint, test2 TINYBLOB)");
       stmt.execute("FLUSH TABLES");
     }
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE ByteTest");
+      stmt.execute("DROP TABLE IF EXISTS ByteTest");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/CallStatementTest.java b/src/test/java/org/mariadb/jdbc/CallStatementTest.java
@@ -61,7 +61,7 @@ public class CallStatementTest extends BaseTest {
 
   @BeforeClass()
   public static void initClass() throws SQLException {
-    afterClass();
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("CREATE PROCEDURE useParameterName(a int) begin select a; end");
       stmt.execute("CREATE PROCEDURE useWrongParameterName(a int) begin select a; end");
@@ -93,7 +93,7 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("DROP PROCEDURE IF EXISTS useParameterName");
       stmt.execute("DROP PROCEDURE IF EXISTS useWrongParameterName");

diff --git a/src/test/java/org/mariadb/jdbc/CancelTest.java b/src/test/java/org/mariadb/jdbc/CancelTest.java
@@ -65,6 +65,7 @@ public class CancelTest extends BaseTest {
 
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE timeoutBatch(id int not null primary key auto_increment, aa text)");
@@ -74,7 +75,7 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("DROP TABLE IF EXISTS timeoutBatch");
       stmt.execute("DROP TABLE IF EXISTS timeoutBatch2");

diff --git a/src/test/java/org/mariadb/jdbc/CheckDataTest.java b/src/test/java/org/mariadb/jdbc/CheckDataTest.java
@@ -67,6 +67,7 @@ public class CheckDataTest extends BaseTest {
 
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE CheckDataTest1(id int not null primary key auto_increment, test varchar(10))");
@@ -81,12 +82,12 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE CheckDataTest1");
-      stmt.execute("DROP TABLE CheckDataTest2");
-      stmt.execute("DROP TABLE CheckDataTest3");
-      stmt.execute("DROP TABLE CheckDataTest4");
+      stmt.execute("DROP TABLE IF EXISTS CheckDataTest1");
+      stmt.execute("DROP TABLE IF EXISTS CheckDataTest2");
+      stmt.execute("DROP TABLE IF EXISTS CheckDataTest3");
+      stmt.execute("DROP TABLE IF EXISTS CheckDataTest4");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/CollationTest.java b/src/test/java/org/mariadb/jdbc/CollationTest.java
@@ -66,6 +66,7 @@
 public class CollationTest extends BaseTest {
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute(
           "CREATE TABLE emojiTest(id int unsigned, field longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci)");
@@ -80,14 +81,14 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE emojiTest");
-      stmt.execute("DROP TABLE unicodeTestChar");
-      stmt.execute("DROP TABLE textUtf8");
-      stmt.execute("DROP TABLE blobUtf8");
-      stmt.execute("DROP TABLE fooLatin1");
-      stmt.execute("DROP TABLE languageCasing");
+      stmt.execute("DROP TABLE IF EXISTS emojiTest");
+      stmt.execute("DROP TABLE IF EXISTS unicodeTestChar");
+      stmt.execute("DROP TABLE IF EXISTS textUtf8");
+      stmt.execute("DROP TABLE IF EXISTS blobUtf8");
+      stmt.execute("DROP TABLE IF EXISTS fooLatin1");
+      stmt.execute("DROP TABLE IF EXISTS languageCasing");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/ComMultiPrepareStatementTest.java b/src/test/java/org/mariadb/jdbc/ComMultiPrepareStatementTest.java
@@ -61,16 +61,17 @@
 public class ComMultiPrepareStatementTest extends BaseTest {
   @BeforeClass()
   public static void initClass() throws SQLException {
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("CREATE TABLE test_insert_select_com_multi(`field1` varchar(20))");
       stmt.execute("FLUSH TABLES");
     }
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
-      stmt.execute("DROP TABLE test_insert_select_com_multi");
+      stmt.execute("DROP TABLE IF EXISTS test_insert_select_com_multi");
     }
   }
 

diff --git a/src/test/java/org/mariadb/jdbc/ConnectionTest.java b/src/test/java/org/mariadb/jdbc/ConnectionTest.java
@@ -67,7 +67,7 @@ public class ConnectionTest extends BaseTest {
 
   @BeforeClass()
   public static void initClass() throws SQLException {
-    afterClass();
+    drop();
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("CREATE TABLE dummy(a BLOB)");
       stmt.execute("CREATE DATABASE gogogo");
@@ -76,7 +76,7 @@ public static void initClass() throws SQLException {
   }
 
   @AfterClass
-  public static void afterClass() throws SQLException {
+  public static void drop() throws SQLException {
     try (Statement stmt = sharedConnection.createStatement()) {
       stmt.execute("DROP TABLE IF EXISTS dummy");
       stmt.execute("DROP DATABASE IF EXISTS gogogo");