Skip to content

Commit 6bffa7b

Browse files
rusherrusher
committed
misc - ensure test cleanup
ensure test cleanup before/after running test, mostly for existing server instance test multiple run
1 parent 1547321 commit 6bffa7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+200
-179
lines changed

‎src/main/java/org/mariadb/jdbc/MariaDbConnection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252

5353
package org.mariadb.jdbc;
5454

55-
import java.io.File;
5655
import java.net.SocketException;
5756
import java.sql.*;
5857
import java.util.HashMap;
@@ -516,10 +515,11 @@ public CallableParameterMetaData getInternalParameterMetaData(
516515
PreparedStatement prep =
517516
new ClientSidePreparedStatement(
518517
this,
519-
"SELECT * from information_schema.PARAMETERS " +
520-
"WHERE SPECIFIC_NAME = ? " +
521-
"AND SPECIFIC_SCHEMA = " + (databaseName != null ? "?" : "DATABASE()") +
522-
" ORDER BY ORDINAL_POSITION",
518+
"SELECT * from information_schema.PARAMETERS "
519+
+ "WHERE SPECIFIC_NAME = ? "
520+
+ "AND SPECIFIC_SCHEMA = "
521+
+ (databaseName != null ? "?" : "DATABASE()")
522+
+ " ORDER BY ORDINAL_POSITION",
523523
ResultSet.TYPE_FORWARD_ONLY,
524524
ResultSet.CONCUR_READ_ONLY,
525525
Statement.NO_GENERATED_KEYS,

‎src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@
5252

5353
package org.mariadb.jdbc.internal.com.read.resultset.rowprotocol;
5454

55-
import org.mariadb.jdbc.internal.ColumnType;
56-
import org.mariadb.jdbc.internal.com.read.resultset.ColumnDefinition;
57-
import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
58-
import org.mariadb.jdbc.util.Options;
59-
6055
import java.math.BigDecimal;
6156
import java.math.BigInteger;
6257
import java.nio.charset.StandardCharsets;
@@ -66,6 +61,10 @@
6661
import java.time.format.DateTimeParseException;
6762
import java.util.Calendar;
6863
import java.util.TimeZone;
64+
import org.mariadb.jdbc.internal.ColumnType;
65+
import org.mariadb.jdbc.internal.com.read.resultset.ColumnDefinition;
66+
import org.mariadb.jdbc.internal.util.exceptions.ExceptionFactory;
67+
import org.mariadb.jdbc.util.Options;
6968

7069
public class BinaryRowProtocol extends RowProtocol {
7170

‎src/main/java/org/mariadb/jdbc/internal/util/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ public static boolean validateFileName(
10191019
if (parameters != null) {
10201020
pattern =
10211021
Pattern.compile(
1022-
"^(\\s*\\/\\*([^\\*]|\\*[^\\/])*\\*\\/)*\\s*LOAD\\s+DATA\\s+((LOW_PRIORITY|CONCURRENT)\\s+)?LOCAL\\s+INFILE\\s+\\?",
1022+
"^(\\s*\\/\\*([^\\*]|\\*[^\\/])*\\*\\/)*\\s*LOAD\\s+(DATA|XML)\\s+((LOW_PRIORITY|CONCURRENT)\\s+)?LOCAL\\s+INFILE\\s+\\?",
10231023
Pattern.CASE_INSENSITIVE);
10241024
if (pattern.matcher(sql).find() && parameters.length > 0) {
10251025
return parameters[0].toString().toLowerCase().equals("'" + fileName.toLowerCase() + "'");

‎src/test/java/org/mariadb/jdbc/AllowMultiQueriesTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public class AllowMultiQueriesTest extends BaseTest {
7171
*/
7272
@BeforeClass()
7373
public static void initClass() throws SQLException {
74+
drop();
7475
try (Statement stmt = sharedConnection.createStatement()) {
7576
stmt.execute(
7677
"CREATE TABLE AllowMultiQueriesTest(id int not null primary key auto_increment, test varchar(10))");
@@ -83,10 +84,10 @@ public static void initClass() throws SQLException {
8384
}
8485

8586
@AfterClass
86-
public static void afterClass() throws SQLException {
87+
public static void drop() throws SQLException {
8788
try (Statement stmt = sharedConnection.createStatement()) {
88-
stmt.execute("DROP TABLE AllowMultiQueriesTest");
89-
stmt.execute("DROP TABLE AllowMultiQueriesTest2");
89+
stmt.execute("DROP TABLE IF EXISTS AllowMultiQueriesTest");
90+
stmt.execute("DROP TABLE IF EXISTS AllowMultiQueriesTest2");
9091
}
9192
}
9293

‎src/test/java/org/mariadb/jdbc/BasicBatchTest.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ public class BasicBatchTest extends BaseTest {
6969
*/
7070
@BeforeClass()
7171
public static void initClass() throws SQLException {
72+
drop();
7273
try (Statement stmt = sharedConnection.createStatement()) {
7374
stmt.execute(
7475
"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 {
8889
}
8990

9091
@AfterClass
91-
public static void afterClass() throws SQLException {
92+
public static void drop() throws SQLException {
9293
try (Statement stmt = sharedConnection.createStatement()) {
93-
stmt.execute("DROP TABLE test_batch");
94-
stmt.execute("DROP TABLE test_batch2");
95-
stmt.execute("DROP TABLE test_batch3");
96-
stmt.execute("DROP TABLE batchUpdateException");
97-
stmt.execute("DROP TABLE batchPrepareUpdateException");
98-
stmt.execute("DROP TABLE rewritetest");
99-
stmt.execute("DROP TABLE rewritetest2");
100-
stmt.execute("DROP TABLE bug501452");
101-
stmt.execute("DROP TABLE testBatchString");
94+
stmt.execute("DROP TABLE IF EXISTS test_batch");
95+
stmt.execute("DROP TABLE IF EXISTS test_batch2");
96+
stmt.execute("DROP TABLE IF EXISTS test_batch3");
97+
stmt.execute("DROP TABLE IF EXISTS batchUpdateException");
98+
stmt.execute("DROP TABLE IF EXISTS batchPrepareUpdateException");
99+
stmt.execute("DROP TABLE IF EXISTS rewritetest");
100+
stmt.execute("DROP TABLE IF EXISTS rewritetest2");
101+
stmt.execute("DROP TABLE IF EXISTS bug501452");
102+
stmt.execute("DROP TABLE IF EXISTS testBatchString");
102103
}
103104
}
104105

‎src/test/java/org/mariadb/jdbc/BigQueryTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public class BigQueryTest extends BaseTest {
7272
*/
7373
@BeforeClass()
7474
public static void initClass() throws SQLException {
75+
drop();
7576
try (Statement stmt = sharedConnection.createStatement()) {
7677
stmt.execute(
7778
"CREATE TABLE bigblob(id int not null primary key auto_increment, test longblob)");
@@ -89,14 +90,14 @@ public static void initClass() throws SQLException {
8990
}
9091

9192
@AfterClass
92-
public static void afterClass() throws SQLException {
93+
public static void drop() throws SQLException {
9394
try (Statement stmt = sharedConnection.createStatement()) {
94-
stmt.execute("DROP TABLE bigblob");
95-
stmt.execute("DROP TABLE bigblob2");
96-
stmt.execute("DROP TABLE bigblob3");
97-
stmt.execute("DROP TABLE bigblob4");
98-
stmt.execute("DROP TABLE bigblob5");
99-
stmt.execute("DROP TABLE bigblob6");
95+
stmt.execute("DROP TABLE IF EXISTS bigblob");
96+
stmt.execute("DROP TABLE IF EXISTS bigblob2");
97+
stmt.execute("DROP TABLE IF EXISTS bigblob3");
98+
stmt.execute("DROP TABLE IF EXISTS bigblob4");
99+
stmt.execute("DROP TABLE IF EXISTS bigblob5");
100+
stmt.execute("DROP TABLE IF EXISTS bigblob6");
100101
}
101102
}
102103

‎src/test/java/org/mariadb/jdbc/BlobTest.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public class BlobTest extends BaseTest {
7575
*/
7676
@BeforeClass()
7777
public static void initClass() throws SQLException {
78+
drop();
7879
try (Statement stmt = sharedConnection.createStatement()) {
7980
stmt.execute(
8081
"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 {
101102
}
102103

103104
@AfterClass
104-
public static void afterClass() throws SQLException {
105+
public static void drop() throws SQLException {
105106
try (Statement stmt = sharedConnection.createStatement()) {
106-
stmt.execute("DROP TABLE bug716378");
107-
stmt.execute("DROP TABLE BlobTeststreamtest2");
108-
stmt.execute("DROP TABLE BlobTeststreamtest3");
109-
stmt.execute("DROP TABLE BlobTestclobtest");
110-
stmt.execute("DROP TABLE BlobTestclobtest2");
111-
stmt.execute("DROP TABLE BlobTestclobtest3");
112-
stmt.execute("DROP TABLE BlobTestclobtest4");
113-
stmt.execute("DROP TABLE BlobTestclobtest5");
114-
stmt.execute("DROP TABLE BlobTestblobtest");
115-
stmt.execute("DROP TABLE BlobTestblobtest2");
116-
stmt.execute("DROP TABLE conj77_test");
117-
stmt.execute("DROP TABLE emptyBlob");
107+
stmt.execute("DROP TABLE IF EXISTS bug716378");
108+
stmt.execute("DROP TABLE IF EXISTS BlobTeststreamtest2");
109+
stmt.execute("DROP TABLE IF EXISTS BlobTeststreamtest3");
110+
stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest");
111+
stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest2");
112+
stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest3");
113+
stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest4");
114+
stmt.execute("DROP TABLE IF EXISTS BlobTestclobtest5");
115+
stmt.execute("DROP TABLE IF EXISTS BlobTestblobtest");
116+
stmt.execute("DROP TABLE IF EXISTS BlobTestblobtest2");
117+
stmt.execute("DROP TABLE IF EXISTS conj77_test");
118+
stmt.execute("DROP TABLE IF EXISTS emptyBlob");
118119
}
119120
}
120121

‎src/test/java/org/mariadb/jdbc/BooleanTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public class BooleanTest extends BaseTest {
6868
*/
6969
@BeforeClass()
7070
public static void initClass() throws SQLException {
71+
drop();
7172
try (Statement stmt = sharedConnection.createStatement()) {
7273
stmt.execute(
7374
"CREATE TABLE booleantest(id int not null primary key auto_increment, test boolean)");
@@ -80,11 +81,11 @@ public static void initClass() throws SQLException {
8081
}
8182

8283
@AfterClass
83-
public static void afterClass() throws SQLException {
84+
public static void drop() throws SQLException {
8485
try (Statement stmt = sharedConnection.createStatement()) {
85-
stmt.execute("DROP TABLE booleantest");
86-
stmt.execute("DROP TABLE booleanvalue");
87-
stmt.execute("DROP TABLE booleanAllField");
86+
stmt.execute("DROP TABLE IF EXISTS booleantest");
87+
stmt.execute("DROP TABLE IF EXISTS booleanvalue");
88+
stmt.execute("DROP TABLE IF EXISTS booleanAllField");
8889
}
8990
}
9091

‎src/test/java/org/mariadb/jdbc/BufferTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ public class BufferTest extends BaseTest {
8383

8484
@BeforeClass()
8585
public static void initClass() throws SQLException {
86-
afterClass();
86+
drop();
8787
try (Statement stmt = sharedConnection.createStatement()) {
8888
stmt.execute("CREATE TABLE buffer_test(test longText)");
8989
stmt.execute("FLUSH TABLES");
9090
}
9191
}
9292

9393
@AfterClass
94-
public static void afterClass() throws SQLException {
94+
public static void drop() throws SQLException {
9595
try (Statement stmt = sharedConnection.createStatement()) {
9696
stmt.execute("DROP TABLE IF EXISTS buffer_test");
9797
}

‎src/test/java/org/mariadb/jdbc/ByteTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ public class ByteTest extends BaseTest {
6565

6666
@BeforeClass()
6767
public static void initClass() throws SQLException {
68+
drop();
6869
try (Statement stmt = sharedConnection.createStatement()) {
6970
stmt.execute("CREATE TABLE ByteTest(test tinyint, test2 TINYBLOB)");
7071
stmt.execute("FLUSH TABLES");
7172
}
7273
}
7374

7475
@AfterClass
75-
public static void afterClass() throws SQLException {
76+
public static void drop() throws SQLException {
7677
try (Statement stmt = sharedConnection.createStatement()) {
77-
stmt.execute("DROP TABLE ByteTest");
78+
stmt.execute("DROP TABLE IF EXISTS ByteTest");
7879
}
7980
}
8081

‎src/test/java/org/mariadb/jdbc/CallStatementTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class CallStatementTest extends BaseTest {
6161

6262
@BeforeClass()
6363
public static void initClass() throws SQLException {
64-
afterClass();
64+
drop();
6565
try (Statement stmt = sharedConnection.createStatement()) {
6666
stmt.execute("CREATE PROCEDURE useParameterName(a int) begin select a; end");
6767
stmt.execute("CREATE PROCEDURE useWrongParameterName(a int) begin select a; end");
@@ -93,7 +93,7 @@ public static void initClass() throws SQLException {
9393
}
9494

9595
@AfterClass
96-
public static void afterClass() throws SQLException {
96+
public static void drop() throws SQLException {
9797
try (Statement stmt = sharedConnection.createStatement()) {
9898
stmt.execute("DROP PROCEDURE IF EXISTS useParameterName");
9999
stmt.execute("DROP PROCEDURE IF EXISTS useWrongParameterName");

‎src/test/java/org/mariadb/jdbc/CancelTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public class CancelTest extends BaseTest {
6565

6666
@BeforeClass()
6767
public static void initClass() throws SQLException {
68+
drop();
6869
try (Statement stmt = sharedConnection.createStatement()) {
6970
stmt.execute(
7071
"CREATE TABLE timeoutBatch(id int not null primary key auto_increment, aa text)");
@@ -74,7 +75,7 @@ public static void initClass() throws SQLException {
7475
}
7576

7677
@AfterClass
77-
public static void afterClass() throws SQLException {
78+
public static void drop() throws SQLException {
7879
try (Statement stmt = sharedConnection.createStatement()) {
7980
stmt.execute("DROP TABLE IF EXISTS timeoutBatch");
8081
stmt.execute("DROP TABLE IF EXISTS timeoutBatch2");

‎src/test/java/org/mariadb/jdbc/CheckDataTest.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public class CheckDataTest extends BaseTest {
6767

6868
@BeforeClass()
6969
public static void initClass() throws SQLException {
70+
drop();
7071
try (Statement stmt = sharedConnection.createStatement()) {
7172
stmt.execute(
7273
"CREATE TABLE CheckDataTest1(id int not null primary key auto_increment, test varchar(10))");
@@ -81,12 +82,12 @@ public static void initClass() throws SQLException {
8182
}
8283

8384
@AfterClass
84-
public static void afterClass() throws SQLException {
85+
public static void drop() throws SQLException {
8586
try (Statement stmt = sharedConnection.createStatement()) {
86-
stmt.execute("DROP TABLE CheckDataTest1");
87-
stmt.execute("DROP TABLE CheckDataTest2");
88-
stmt.execute("DROP TABLE CheckDataTest3");
89-
stmt.execute("DROP TABLE CheckDataTest4");
87+
stmt.execute("DROP TABLE IF EXISTS CheckDataTest1");
88+
stmt.execute("DROP TABLE IF EXISTS CheckDataTest2");
89+
stmt.execute("DROP TABLE IF EXISTS CheckDataTest3");
90+
stmt.execute("DROP TABLE IF EXISTS CheckDataTest4");
9091
}
9192
}
9293

‎src/test/java/org/mariadb/jdbc/CollationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
public class CollationTest extends BaseTest {
6767
@BeforeClass()
6868
public static void initClass() throws SQLException {
69+
drop();
6970
try (Statement stmt = sharedConnection.createStatement()) {
7071
stmt.execute(
7172
"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 {
8081
}
8182

8283
@AfterClass
83-
public static void afterClass() throws SQLException {
84+
public static void drop() throws SQLException {
8485
try (Statement stmt = sharedConnection.createStatement()) {
85-
stmt.execute("DROP TABLE emojiTest");
86-
stmt.execute("DROP TABLE unicodeTestChar");
87-
stmt.execute("DROP TABLE textUtf8");
88-
stmt.execute("DROP TABLE blobUtf8");
89-
stmt.execute("DROP TABLE fooLatin1");
90-
stmt.execute("DROP TABLE languageCasing");
86+
stmt.execute("DROP TABLE IF EXISTS emojiTest");
87+
stmt.execute("DROP TABLE IF EXISTS unicodeTestChar");
88+
stmt.execute("DROP TABLE IF EXISTS textUtf8");
89+
stmt.execute("DROP TABLE IF EXISTS blobUtf8");
90+
stmt.execute("DROP TABLE IF EXISTS fooLatin1");
91+
stmt.execute("DROP TABLE IF EXISTS languageCasing");
9192
}
9293
}
9394

‎src/test/java/org/mariadb/jdbc/ComMultiPrepareStatementTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,17 @@
6161
public class ComMultiPrepareStatementTest extends BaseTest {
6262
@BeforeClass()
6363
public static void initClass() throws SQLException {
64+
drop();
6465
try (Statement stmt = sharedConnection.createStatement()) {
6566
stmt.execute("CREATE TABLE test_insert_select_com_multi(`field1` varchar(20))");
6667
stmt.execute("FLUSH TABLES");
6768
}
6869
}
6970

7071
@AfterClass
71-
public static void afterClass() throws SQLException {
72+
public static void drop() throws SQLException {
7273
try (Statement stmt = sharedConnection.createStatement()) {
73-
stmt.execute("DROP TABLE test_insert_select_com_multi");
74+
stmt.execute("DROP TABLE IF EXISTS test_insert_select_com_multi");
7475
}
7576
}
7677

‎src/test/java/org/mariadb/jdbc/ConnectionTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class ConnectionTest extends BaseTest {
6767

6868
@BeforeClass()
6969
public static void initClass() throws SQLException {
70-
afterClass();
70+
drop();
7171
try (Statement stmt = sharedConnection.createStatement()) {
7272
stmt.execute("CREATE TABLE dummy(a BLOB)");
7373
stmt.execute("CREATE DATABASE gogogo");
@@ -76,7 +76,7 @@ public static void initClass() throws SQLException {
7676
}
7777

7878
@AfterClass
79-
public static void afterClass() throws SQLException {
79+
public static void drop() throws SQLException {
8080
try (Statement stmt = sharedConnection.createStatement()) {
8181
stmt.execute("DROP TABLE IF EXISTS dummy");
8282
stmt.execute("DROP DATABASE IF EXISTS gogogo");

0 commit comments

Comments
 (0)