Skip to content

Commit 329de9f

Browse files
don't use DatabaseDrive.MSSQL in source-mssql
1 parent 430bbf7 commit 329de9f

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

airbyte-cdk/java/airbyte-cdk/core/src/main/java/io/airbyte/cdk/integrations/JdbcConnector.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.airbyte.cdk.db.factory.DatabaseDriver.MYSQL;
99
import static io.airbyte.cdk.db.factory.DatabaseDriver.POSTGRESQL;
1010

11-
import io.airbyte.cdk.db.factory.DatabaseDriver;
1211
import java.time.Duration;
1312
import java.time.temporal.ChronoUnit;
1413
import java.time.temporal.TemporalUnit;

airbyte-integrations/connectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import com.google.common.collect.ImmutableList;
2626
import com.google.common.collect.ImmutableMap;
2727
import com.google.common.collect.Lists;
28+
import com.microsoft.sqlserver.jdbc.SQLServerDriver;
2829
import io.airbyte.cdk.db.factory.DatabaseDriver;
2930
import io.airbyte.cdk.db.jdbc.JdbcDatabase;
3031
import io.airbyte.cdk.db.jdbc.JdbcUtils;
@@ -102,6 +103,7 @@
102103
public class MssqlSource extends AbstractJdbcSource<JDBCType> implements Source {
103104

104105
private static final Logger LOGGER = LoggerFactory.getLogger(MssqlSource.class);
106+
public static DatabaseDriver driver = new DatabaseDriver (SQLServerDriver.class, "jdbc:sqlserver://%s:%d;databaseName=%s");
105107
public static final String DESCRIBE_TABLE_QUERY =
106108
"""
107109
sp_columns "%s"
@@ -110,7 +112,7 @@ public class MssqlSource extends AbstractJdbcSource<JDBCType> implements Source
110112
"""
111113
SELECT CASE WHEN (SELECT TOP 1 1 FROM "%s"."%s" WHERE "%s" IS NULL)=1 then 1 else 0 end as %s
112114
""";
113-
public static final String DRIVER_CLASS = DatabaseDriver.MSSQLSERVER.driverClassName();
115+
public static final String DRIVER_CLASS = driver.driverClassName();
114116
public static final String MSSQL_CDC_OFFSET = "mssql_cdc_offset";
115117
public static final String MSSQL_DB_HISTORY = "mssql_db_history";
116118
public static final String IS_COMPRESSED = "is_compressed";

airbyte-integrations/connectors/source-mssql/src/test-integration/java/io/airbyte/integrations/source/mssql/AbstractSshMssqlSourceAcceptanceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ private static Database getDatabaseFromConfig(final JsonNode config) {
8989
var dslContext = DSLContextFactory.create(
9090
config.get(JdbcUtils.USERNAME_KEY).asText(),
9191
config.get(JdbcUtils.PASSWORD_KEY).asText(),
92-
DatabaseDriver.MSSQLSERVER.driverClassName(),
93-
String.format(DatabaseDriver.MSSQLSERVER.urlFormatString(),
92+
MssqlSource.driver.driverClassName(),
93+
String.format(MssqlSource.driver.urlFormatString(),
9494
config.get(JdbcUtils.HOST_KEY).asText(),
9595
config.get(JdbcUtils.PORT_KEY).asInt(),
9696
config.get(JdbcUtils.DATABASE_KEY).asText()) + ";encrypt=false",

airbyte-integrations/connectors/source-mssql/src/test-performance/java/io/airbyte/integrations/source/mssql/FillMsSqlTestDbScriptTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected Database setupDatabase(final String dbName) {
5353
dslContext = DSLContextFactory.create(
5454
config.get(JdbcUtils.USERNAME_KEY).asText(),
5555
config.get(JdbcUtils.PASSWORD_KEY).asText(),
56-
DatabaseDriver.MSSQLSERVER.driverClassName(),
56+
MssqlSource.driver.driverClassName(),
5757
String.format("jdbc:sqlserver://%s:%s;databaseName=%s;",
5858
config.get(JdbcUtils.HOST_KEY).asText(),
5959
config.get(JdbcUtils.PORT_KEY).asInt(),

airbyte-integrations/connectors/source-mssql/src/testFixtures/java/io/airbyte/integrations/source/mssql/MsSQLTestDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public Stream<String> mssqlCmd(final Stream<String> sql) {
259259

260260
@Override
261261
public DatabaseDriver getDatabaseDriver() {
262-
return DatabaseDriver.MSSQLSERVER;
262+
return MssqlSource.driver;
263263
}
264264

265265
@Override

0 commit comments

Comments
 (0)