🎉 Source Snowflake : Update JDBC driver for Snowflake to 3.13.22 (air…

…bytehq#16766)

Update JDBC driver for Snowflake

Co-authored-by: Liren Tu <tuliren.git@outlook.com>
Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>

airbyte-config/init/src/main/resources/seed/source_definitions.yaml

@@ -972,7 +972,7 @@
 - name: Snowflake
   sourceDefinitionId: e2d65910-8c8b-40a1-ae7d-ee2416b2bfa2
   dockerRepository: airbyte/source-snowflake
-  dockerImageTag: 0.1.21
+  dockerImageTag: 0.1.22
   documentationUrl: https://docs.airbyte.io/integrations/sources/snowflake
   icon: snowflake.svg
   sourceType: database

airbyte-config/init/src/main/resources/seed/source_specs.yaml

@@ -10026,7 +10026,7 @@
         - - "client_secret"
         oauthFlowOutputParameters:
         - - "refresh_token"
-- dockerImage: "airbyte/source-snowflake:0.1.21"
+- dockerImage: "airbyte/source-snowflake:0.1.22"
   spec:
     documentationUrl: "https://docs.airbyte.io/integrations/sources/snowflake"
     connectionSpecification:

airbyte-integrations/connectors/source-snowflake/Dockerfile

@@ -16,5 +16,5 @@ ENV APPLICATION source-snowflake
 
 COPY --from=build /airbyte /airbyte
 
-LABEL io.airbyte.version=0.1.21
+LABEL io.airbyte.version=0.1.22
 LABEL io.airbyte.name=airbyte/source-snowflake

airbyte-integrations/connectors/source-snowflake/README.md

@@ -37,4 +37,6 @@
 }
 ```
 ## For Airbyte employees
-Put the contents of the `Snowflake Insert Test Creds` secret on Lastpass into `secrets/config.json` to be able to run integration tests locally.
+To be able to run integration tests locally:
+1. Put the contents of the `Source snowflake test creds (secrets/config.json)` secret on Lastpass into `secrets/config.json`.
+1. Put the contents of the `SECRET_SOURCE-SNOWFLAKE_OAUTH__CREDS (secrets/config_auth.json)` secret on Lastpass into `secrets/config_auth.json`.

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

@@ -16,7 +16,7 @@ dependencies {
     implementation project(':airbyte-integrations:connectors:source-relational-db')
     implementation project(':airbyte-protocol:protocol-models')
     implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
-    implementation group: 'net.snowflake', name: 'snowflake-jdbc', version: '3.13.9'
+    implementation group: 'net.snowflake', name: 'snowflake-jdbc', version: '3.13.22'
     implementation 'com.zaxxer:HikariCP:5.0.1'
 
     testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))

airbyte-integrations/connectors/source-snowflake/src/main/java/io.airbyte.integrations.source.snowflake/SnowflakeSourceOperations.java

@@ -26,7 +26,7 @@ protected void putDouble(final ObjectNode node, final String columnName, final R
   }
 
   @Override
-  protected void putBigInt(final ObjectNode node, final String columnName, final ResultSet resultSet, int index) {
+  protected void putBigInt(final ObjectNode node, final String columnName, final ResultSet resultSet, final int index) {
     try {
       final var value = resultSet.getBigDecimal(index);
       node.put(columnName, value);
@@ -41,7 +41,7 @@ protected void setTimestamp(final PreparedStatement preparedStatement, final int
   }
 
   @Override
-  public JsonSchemaType getJsonType(JDBCType jdbcType) {
+  public JsonSchemaType getJsonType(final JDBCType jdbcType) {
     return switch (jdbcType) {
       case BIT, BOOLEAN -> JsonSchemaType.BOOLEAN;
       case REAL, FLOAT, DOUBLE, NUMERIC, DECIMAL -> JsonSchemaType.NUMBER;
@@ -60,4 +60,37 @@ public JsonSchemaType getJsonType(JDBCType jdbcType) {
     };
   }
 
+  /**
+   * The only difference between this method and the one in {@link JdbcSourceOperations} is that
+   * the TIMESTAMP_WITH_TIMEZONE columns are also converted using the putTimestamp method.
+   * This is necessary after the JDBC upgrade from 3.13.9 to 3.13.22. This change may need to be
+   * added to {@link JdbcSourceOperations#setJsonField} in the future.
+   * <p/>
+   * See issue: https://github.com/airbytehq/airbyte/issues/16838.
+   */
+  @Override
+  public void setJsonField(final ResultSet resultSet, final int colIndex, final ObjectNode json) throws SQLException {
+    final int columnTypeInt = resultSet.getMetaData().getColumnType(colIndex);
+    final String columnName = resultSet.getMetaData().getColumnName(colIndex);
+    final JDBCType columnType = safeGetJdbcType(columnTypeInt);
+
+    // https://www.cis.upenn.edu/~bcpierce/courses/629/jdkdocs/guide/jdbc/getstart/mapping.doc.html
+    switch (columnType) {
+      case BIT, BOOLEAN -> putBoolean(json, columnName, resultSet, colIndex);
+      case TINYINT, SMALLINT -> putShortInt(json, columnName, resultSet, colIndex);
+      case INTEGER -> putInteger(json, columnName, resultSet, colIndex);
+      case BIGINT -> putBigInt(json, columnName, resultSet, colIndex);
+      case FLOAT, DOUBLE -> putDouble(json, columnName, resultSet, colIndex);
+      case REAL -> putFloat(json, columnName, resultSet, colIndex);
+      case NUMERIC, DECIMAL -> putBigDecimal(json, columnName, resultSet, colIndex);
+      case CHAR, VARCHAR, LONGVARCHAR -> putString(json, columnName, resultSet, colIndex);
+      case DATE -> putDate(json, columnName, resultSet, colIndex);
+      case TIME -> putTime(json, columnName, resultSet, colIndex);
+      case TIMESTAMP, TIMESTAMP_WITH_TIMEZONE -> putTimestamp(json, columnName, resultSet, colIndex);
+      case BLOB, BINARY, VARBINARY, LONGVARBINARY -> putBinary(json, columnName, resultSet, colIndex);
+      case ARRAY -> putArray(json, columnName, resultSet, colIndex);
+      default -> putDefault(json, columnName, resultSet, colIndex);
+    }
+  }
+
 }

airbyte-integrations/connectors/source-snowflake/src/test-integration/java/io/airbyte/integrations/io/airbyte/integration_tests/sources/SnowflakeJdbcSourceAcceptanceTest.java

@@ -126,7 +126,7 @@ public void testCheckIncorrectHostFailure() throws Exception {
     ((ObjectNode) config).put(JdbcUtils.HOST_KEY, "localhost2");
     final AirbyteConnectionStatus status = source.check(config);
     assertEquals(Status.FAILED, status.getStatus());
-    assertTrue(status.getMessage().contains("State code: 28000; Error code: 200028;"));
+    assertTrue(status.getMessage().contains("Could not connect with provided configuration"));
   }
 
   @Override

docs/integrations/sources/snowflake.md

@@ -4,7 +4,7 @@
 
 The Snowflake source allows you to sync data from Snowflake. It supports both Full Refresh and Incremental syncs. You can choose if this connector will copy only the new or updated data, or all rows in the tables and columns you set up for replication, every time a sync is run.
 
-This Snowflake source connector is built on top of the source-jdbc code base and is configured to rely on JDBC 3.12.14 [Snowflake driver](https://github.com/snowflakedb/snowflake-jdbc) as described in Snowflake [documentation](https://docs.snowflake.com/en/user-guide/jdbc.html).
+This Snowflake source connector is built on top of the source-jdbc code base and is configured to rely on JDBC  3.13.22 [Snowflake driver](https://github.com/snowflakedb/snowflake-jdbc) as described in Snowflake [documentation](https://docs.snowflake.com/en/user-guide/jdbc.html).
 
 #### Resulting schema
 
@@ -122,6 +122,7 @@ To read more please check official [Snowflake documentation](https://docs.snowfl
 
 | Version   | Date | Pull Request | Subject |
 |:----------| :--- | :--- | :--- |
+| 0.1.22    | 2022-09-21 | [16766](https://github.com/airbytehq/airbyte/pull/16766) | Update JDBC Driver version to 3.13.22  |
 | 0.1.21    | 2022-09-14 | [15668](https://github.com/airbytehq/airbyte/pull/15668) | Wrap logs in AirbyteLogMessage  |
 | 0.1.20  | 2022-09-01 | [16258](https://github.com/airbytehq/airbyte/pull/16258) | Emit state messages more frequently |
 | 0.1.19    | 2022-08-19 | [15797](https://github.com/airbytehq/airbyte/pull/15797) | Allow using role during oauth |