Revert "6339: error when attempting to use azure sql database within …

…an elastic pool as source for cdc based replication (#13866)" (#14011) This reverts commit 0d870bd.
airbytehq · Jun 22, 2022 · 1b28dce · 1b28dce
1 parent 3a179a8
commit 1b28dce
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/airbyte-integrations/connectors/source-mssql/Dockerfile b/airbyte-integrations/connectors/source-mssql/Dockerfile
@@ -16,5 +16,5 @@ ENV APPLICATION source-mssql
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.4.4
+LABEL io.airbyte.version=0.4.3
 LABEL io.airbyte.name=airbyte/source-mssql
diff --git a/...nnectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java b/...nnectors/source-mssql/src/main/java/io/airbyte/integrations/source/mssql/MssqlSource.java
@@ -37,9 +37,7 @@
 import java.io.File;
 import java.sql.JDBCType;
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
@@ -277,17 +275,7 @@ protected void assertCdcEnabledInDb(final JsonNode config, final JdbcDatabase da
   protected void assertCdcSchemaQueryable(final JsonNode config, final JdbcDatabase database)
       throws SQLException {
     final List<JsonNode> queryResponse = database.queryJsons(connection -> {
-      boolean isAzureSQL = false;
-
-      try (Statement stmt = connection.createStatement();
-          ResultSet editionRS = stmt.executeQuery("SELECT ServerProperty('Edition')")) {
-        isAzureSQL = editionRS.next() && "SQL Azure".equals(editionRS.getString(1));
-      }
-
-      // Azure SQL does not support USE clause
-      final String sql =
-          isAzureSQL ? "SELECT * FROM cdc.change_tables" : "USE " + config.get("database").asText() + "; SELECT * FROM cdc.change_tables";
-
+      final String sql = "USE " + config.get("database").asText() + "; SELECT * FROM cdc.change_tables";
       final PreparedStatement ps = connection.prepareStatement(sql);
       LOGGER.info(String.format(
           "Checking user '%s' can query the cdc schema and that we have at least 1 cdc enabled table using the query: '%s'",

diff --git a/docs/integrations/sources/mssql.md b/docs/integrations/sources/mssql.md
@@ -302,7 +302,6 @@ If you do not see a type in this list, assume that it is coerced into a string.
 
 | Version | Date       | Pull Request | Subject                                                                                                |
 |:--------|:-----------| :----------------------------------------------------- |:-------------------------------------------------------------------------------------------------------|
-| 0.4.4   | 2022-07-20 | [13866](https://github.com/airbytehq/airbyte/pull/13866) | Omit using 'USE' keyword on Azure SQL with CDC    |
 | 0.4.3   | 2022-07-17 | [13887](https://github.com/airbytehq/airbyte/pull/13887) | Increase version to include changes from [13854](https://github.com/airbytehq/airbyte/pull/13854)           |
 | 0.4.2   | 2022-06-06 | [13435](https://github.com/airbytehq/airbyte/pull/13435) | Adjust JDBC fetch size based on max memory and max row size                                            |
 | 0.4.1   | 2022-05-25 | [13419](https://github.com/airbytehq/airbyte/pull/13419) | Correct enum for Standard method.                                                                      |