Skip to content

Commit cb0ca35

Browse files
tulirentuliren
committed
Remove mysql database creation method
1 parent 5692020 commit cb0ca35

File tree

12 files changed

+21
-30
lines changed

12 files changed

+21
-30
lines changed

‎airbyte-db/lib/src/main/java/io/airbyte/db/Databases.java

-12
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,6 @@ public static Database createPostgresDatabaseWithRetryTimeout(final String usern
9292
return database;
9393
}
9494

95-
public static JdbcDatabase createRedshiftDatabase(final String username, final String password, final String jdbcConnectionString) {
96-
return createJdbcDatabase(username, password, jdbcConnectionString, "com.amazon.redshift.jdbc.Driver");
97-
}
98-
99-
public static Database createMySqlDatabase(final String username, final String password, final String jdbcConnectionString) {
100-
return createDatabase(username, password, jdbcConnectionString, "com.mysql.cj.jdbc.Driver", SQLDialect.MYSQL);
101-
}
102-
10395
public static Database createSqlServerDatabase(final String username, final String password, final String jdbcConnectionString) {
10496
return createDatabase(username, password, jdbcConnectionString, "com.microsoft.sqlserver.jdbc.SQLServerDriver", SQLDialect.DEFAULT);
10597
}
@@ -108,10 +100,6 @@ public static Database createOracleDatabase(final String username, final String
108100
return createDatabase(username, password, jdbcConnectionString, "oracle.jdbc.OracleDriver", SQLDialect.DEFAULT);
109101
}
110102

111-
public static Database createClickhouseDatabase(final String username, final String password, final String jdbcConnectionString) {
112-
return createDatabase(username, password, jdbcConnectionString, "ru.yandex.clickhouse.ClickHouseDriver", SQLDialect.DEFAULT);
113-
}
114-
115103
public static Database createMariaDbDatabase(final String username, final String password, final String jdbcConnectionString) {
116104
return createDatabase(username, password, jdbcConnectionString, "org.mariadb.jdbc.Driver", SQLDialect.MARIADB);
117105
}

‎airbyte-integrations/connectors/destination-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLStrictEncryptDestinationAcceptanceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private List<JsonNode> retrieveRecordsFromTable(final String tableName, final St
106106
db.getHost(),
107107
db.getFirstMappedPort(),
108108
db.getDatabaseName()),
109-
"com.mysql.cj.jdbc.Driver",
109+
MySQLDestination.DRIVER_CLASS,
110110
SQLDialect.MYSQL).query(
111111
ctx -> ctx
112112
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName,
@@ -167,7 +167,7 @@ private void executeQuery(final String query) {
167167
db.getHost(),
168168
db.getFirstMappedPort(),
169169
db.getDatabaseName()),
170-
"com.mysql.cj.jdbc.Driver",
170+
MySQLDestination.DRIVER_CLASS,
171171
SQLDialect.MYSQL).query(
172172
ctx -> ctx
173173
.execute(query));

‎airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/MySQLDestinationAcceptanceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private List<JsonNode> retrieveRecordsFromTable(final String tableName, final St
108108
db.getHost(),
109109
db.getFirstMappedPort(),
110110
db.getDatabaseName()),
111-
"com.mysql.cj.jdbc.Driver",
111+
MySQLDestination.DRIVER_CLASS,
112112
SQLDialect.MYSQL).query(
113113
ctx -> ctx
114114
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName,
@@ -169,7 +169,7 @@ private void executeQuery(final String query) {
169169
db.getHost(),
170170
db.getFirstMappedPort(),
171171
db.getDatabaseName()),
172-
"com.mysql.cj.jdbc.Driver",
172+
MySQLDestination.DRIVER_CLASS,
173173
SQLDialect.MYSQL).query(
174174
ctx -> ctx
175175
.execute(query));

‎airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SshMySQLDestinationAcceptanceTest.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.List;
2424
import java.util.stream.Collectors;
2525
import org.apache.commons.lang3.RandomStringUtils;
26+
import org.jooq.SQLDialect;
2627

2728
/**
2829
* Abstract class that allows us to avoid duplicating testing logic for testing SSH with a key file
@@ -109,12 +110,14 @@ protected List<String> resolveIdentifier(final String identifier) {
109110
}
110111

111112
private static Database getDatabaseFromConfig(final JsonNode config) {
112-
return Databases.createMySqlDatabase(
113+
return Databases.createDatabase(
113114
config.get("username").asText(),
114115
config.get("password").asText(),
115116
String.format("jdbc:mysql://%s:%s",
116117
config.get("host").asText(),
117-
config.get("port").asText()));
118+
config.get("port").asText()),
119+
MySQLDestination.DRIVER_CLASS,
120+
SQLDialect.MYSQL);
118121
}
119122

120123
private List<JsonNode> retrieveRecordsFromTable(final String tableName, final String schemaName) throws Exception {

‎airbyte-integrations/connectors/destination-mysql/src/test-integration/java/io/airbyte/integrations/destination/mysql/SslMySQLDestinationAcceptanceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private List<JsonNode> retrieveRecordsFromTable(final String tableName, final St
9999
db.getHost(),
100100
db.getFirstMappedPort(),
101101
db.getDatabaseName()),
102-
"com.mysql.cj.jdbc.Driver",
102+
MySQLDestination.DRIVER_CLASS,
103103
SQLDialect.MYSQL).query(
104104
ctx -> ctx
105105
.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC;", schemaName, tableName,
@@ -131,7 +131,7 @@ private void executeQuery(final String query) {
131131
db.getHost(),
132132
db.getFirstMappedPort(),
133133
db.getDatabaseName()),
134-
"com.mysql.cj.jdbc.Driver",
134+
MySQLDestination.DRIVER_CLASS,
135135
SQLDialect.MYSQL).query(
136136
ctx -> ctx
137137
.execute(query));

‎airbyte-integrations/connectors/source-mysql-strict-encrypt/src/test-integration/java/io/airbyte/integrations/source/mysql_strict_encrypt/MySqlStrictEncryptSourceAcceptanceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc
5959
config.get("port").asText(),
6060
config.get("database").asText(),
6161
String.join("&", SSL_PARAMETERS)),
62-
"com.mysql.cj.jdbc.Driver",
62+
MySqlSource.DRIVER_CLASS,
6363
SQLDialect.MYSQL);
6464

6565
database.query(ctx -> {

‎airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/CdcMySqlSourceDatatypeTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected Database setupDatabase() throws Exception {
6666
config.get("host").asText(),
6767
config.get("port").asText(),
6868
config.get("database").asText()),
69-
"com.mysql.cj.jdbc.Driver",
69+
MySqlSource.DRIVER_CLASS,
7070
SQLDialect.MYSQL);
7171

7272
// It disable strict mode in the DB and allows to insert specific values.
@@ -245,7 +245,7 @@ protected void initTests() {
245245
TestDataHolder.builder()
246246
.sourceType("date")
247247
.fullSourceDataType("date not null")
248-
.airbyteType(JsonSchemaPrimitive.STRING)
248+
.airbyteType(JsonSchemaType.STRING)
249249
.addInsertValues("'0000-00-00'")
250250
.addExpectedValues("1970-01-01T00:00:00Z")
251251
.build());
@@ -263,7 +263,7 @@ protected void initTests() {
263263
TestDataHolder.builder()
264264
.sourceType("datetime")
265265
.fullSourceDataType("datetime not null")
266-
.airbyteType(JsonSchemaPrimitive.STRING)
266+
.airbyteType(JsonSchemaType.STRING)
267267
.addInsertValues("'0000-00-00 00:00:00'")
268268
.addExpectedValues("1970-01-01T00:00:00Z")
269269
.build());
@@ -281,7 +281,7 @@ protected void initTests() {
281281
TestDataHolder.builder()
282282
.sourceType("timestamp")
283283
.fullSourceDataType("timestamp not null")
284-
.airbyteType(JsonSchemaPrimitive.STRING)
284+
.airbyteType(JsonSchemaType.STRING)
285285
.addInsertValues("'0000-00-00 00:00:00.000000'")
286286
.addExpectedValues("1970-01-01T00:00:00Z")
287287
.build());

‎airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceAcceptanceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc
5555
config.get("host").asText(),
5656
config.get("port").asText(),
5757
config.get("database").asText()),
58-
"com.mysql.cj.jdbc.Driver",
58+
MySqlSource.DRIVER_CLASS,
5959
SQLDialect.MYSQL);
6060

6161
database.query(ctx -> {

‎airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSourceDatatypeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected Database setupDatabase() throws Exception {
7272
config.get("host").asText(),
7373
config.get("port").asText(),
7474
config.get("database").asText()),
75-
"com.mysql.cj.jdbc.Driver",
75+
MySqlSource.DRIVER_CLASS,
7676
SQLDialect.MYSQL,
7777
"zeroDateTimeBehavior=convertToNull");
7878

‎airbyte-integrations/connectors/source-mysql/src/test-integration/java/io/airbyte/integrations/source/mysql/MySqlSslSourceAcceptanceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ protected void setupEnvironment(final TestDestinationEnv environment) throws Exc
4040
config.get("port").asText(),
4141
config.get("database").asText(),
4242
String.join("&", SSL_PARAMETERS)),
43-
"com.mysql.cj.jdbc.Driver",
43+
MySqlSource.DRIVER_CLASS,
4444
SQLDialect.MYSQL);
4545

4646
database.query(ctx -> {

‎airbyte-integrations/connectors/source-mysql/src/test-performance/java/io/airbyte/integrations/source/mysql/FillMySqlTestDbScriptTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected Database setupDatabase(String dbName) throws Exception {
5252
config.get("host").asText(),
5353
config.get("port").asText(),
5454
dbName),
55-
"com.mysql.cj.jdbc.Driver",
55+
MySqlSource.DRIVER_CLASS,
5656
SQLDialect.MYSQL,
5757
"zeroDateTimeBehavior=convertToNull");
5858

‎airbyte-integrations/connectors/source-mysql/src/test-performance/java/io/airbyte/integrations/source/mysql/MySqlRdsSourcePerformanceSecretTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected void setupDatabase(String dbName) throws Exception {
4646
config.get("host").asText(),
4747
config.get("port").asText(),
4848
dbName),
49-
"com.mysql.cj.jdbc.Driver",
49+
MySqlSource.DRIVER_CLASS,
5050
SQLDialect.MYSQL,
5151
"zeroDateTimeBehavior=convertToNull");
5252

0 commit comments

Comments
 (0)