Skip to content

Commit 6102af1

Browse files
move source-mssql to latest CDK
1 parent 2d0c49f commit 6102af1

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

airbyte-integrations/connectors/source-mssql/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ plugins {
33
}
44

55
airbyteJavaConnector {
6-
cdkVersionRequired = '0.19.0'
6+
cdkVersionRequired = '0.23.2'
77
features = ['db-sources']
8-
useLocalCdk = false
8+
useLocalCdk = true
99
}
1010

1111
java {

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
import java.io.IOException;
1212
import java.io.UncheckedIOException;
1313
import java.sql.SQLException;
14+
import java.util.Collections;
1415
import java.util.HashMap;
1516
import java.util.List;
1617
import java.util.Map;
17-
import java.util.stream.Collectors;
1818
import java.util.stream.Stream;
19+
import org.apache.commons.lang3.StringUtils;
1920
import org.jooq.SQLDialect;
2021
import org.slf4j.Logger;
2122
import org.slf4j.LoggerFactory;
@@ -157,10 +158,10 @@ public String getJdbcUrl() {
157158
}
158159

159160
@Override
160-
protected Stream<Stream<String>> inContainerBootstrapCmd() {
161-
return Stream.of(
162-
mssqlCmd(Stream.of(String.format("CREATE DATABASE %s", getDatabaseName()))),
163-
mssqlCmd(Stream.of(
161+
protected List<List<String>> inContainerBootstrapCmd() {
162+
return List.of(
163+
mssqlCmd(List.of(String.format("CREATE DATABASE %s", getDatabaseName()))),
164+
mssqlCmd(List.of(
164165
String.format("USE %s", getDatabaseName()),
165166
String.format("CREATE LOGIN %s WITH PASSWORD = '%s', DEFAULT_DATABASE = %s", getUserName(), getPassword(), getDatabaseName()),
166167
String.format("ALTER SERVER ROLE [sysadmin] ADD MEMBER %s", getUserName()),
@@ -174,22 +175,22 @@ protected Stream<Stream<String>> inContainerBootstrapCmd() {
174175
* aren't really worth it.
175176
*/
176177
@Override
177-
protected Stream<String> inContainerUndoBootstrapCmd() {
178-
return Stream.empty();
178+
protected List<String> inContainerUndoBootstrapCmd() {
179+
return Collections.emptyList();
179180
}
180181

181182
public void dropDatabaseAndUser() {
182-
execInContainer(mssqlCmd(Stream.of(
183+
execInContainer(mssqlCmd(List.of(
183184
String.format("USE master"),
184185
String.format("ALTER DATABASE %s SET single_user WITH ROLLBACK IMMEDIATE", getDatabaseName()),
185186
String.format("DROP DATABASE %s", getDatabaseName()))));
186187
}
187188

188-
public Stream<String> mssqlCmd(final Stream<String> sql) {
189-
return Stream.of("/opt/mssql-tools/bin/sqlcmd",
189+
public List<String> mssqlCmd(final List<String> sql) {
190+
return List.of("/opt/mssql-tools/bin/sqlcmd",
190191
"-U", getContainer().getUsername(),
191192
"-P", getContainer().getPassword(),
192-
"-Q", sql.collect(Collectors.joining("; ")),
193+
"-Q", StringUtils.join(sql, "; "),
193194
"-b", "-e");
194195
}
195196

0 commit comments

Comments
 (0)