Destination Oracle: use airbyte default column name + correct ci tests (

#5746) * column name + ci tests * bump version
airbytehq · Aug 31, 2021 · 5a0d7af · 5a0d7af
1 parent ff70fd3
commit 5a0d7af
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/...esources/config/STANDARD_DESTINATION_DEFINITION/3986776d-2319-4de9-8af8-db14c0996e72.json b/...esources/config/STANDARD_DESTINATION_DEFINITION/3986776d-2319-4de9-8af8-db14c0996e72.json
@@ -2,6 +2,6 @@
   "destinationDefinitionId": "3986776d-2319-4de9-8af8-db14c0996e72",
   "name": "Oracle (Alpha)",
   "dockerRepository": "airbyte/destination-oracle",
-  "dockerImageTag": "0.1.6",
+  "dockerImageTag": "0.1.7",
   "documentationUrl": "https://docs.airbyte.io/integrations/destinations/oracle"
 }
diff --git a/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml b/airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
@@ -73,7 +73,7 @@
 - destinationDefinitionId: 3986776d-2319-4de9-8af8-db14c0996e72
   name: Oracle (Alpha)
   dockerRepository: airbyte/destination-oracle
-  dockerImageTag: 0.1.6
+  dockerImageTag: 0.1.7
   documentationUrl: https://docs.airbyte.io/integrations/destinations/oracle
 - destinationDefinitionId: 9f760101-60ae-462f-9ee6-b7a9dafd454d
   name: Kafka

diff --git a/airbyte-integrations/connectors/destination-oracle/Dockerfile b/airbyte-integrations/connectors/destination-oracle/Dockerfile
@@ -8,5 +8,5 @@ COPY build/distributions/${APPLICATION}*.tar ${APPLICATION}.tar
 
 RUN tar xf ${APPLICATION}.tar --strip-components=1
 
-LABEL io.airbyte.version=0.1.6
+LABEL io.airbyte.version=0.1.7
 LABEL io.airbyte.name=airbyte/destination-oracle
diff --git a/...on-oracle/src/main/java/io/airbyte/integrations/destination/oracle/OracleDestination.java b/...on-oracle/src/main/java/io/airbyte/integrations/destination/oracle/OracleDestination.java
@@ -40,9 +40,9 @@ public class OracleDestination extends AbstractJdbcDestination implements Destin
 
   public static final String DRIVER_CLASS = "oracle.jdbc.OracleDriver";
 
-  public static final String COLUMN_NAME_AB_ID = JavaBaseConstants.COLUMN_NAME_AB_ID.substring(1).toUpperCase();
-  public static final String COLUMN_NAME_DATA = JavaBaseConstants.COLUMN_NAME_DATA.substring(1).toUpperCase();
-  public static final String COLUMN_NAME_EMITTED_AT = JavaBaseConstants.COLUMN_NAME_EMITTED_AT.substring(1).toUpperCase();
+  public static final String COLUMN_NAME_AB_ID = "\"" + JavaBaseConstants.COLUMN_NAME_AB_ID.toUpperCase() + "\"";
+  public static final String COLUMN_NAME_DATA = "\"" + JavaBaseConstants.COLUMN_NAME_DATA.toUpperCase() + "\"";
+  public static final String COLUMN_NAME_EMITTED_AT = "\"" + JavaBaseConstants.COLUMN_NAME_EMITTED_AT.toUpperCase() + "\"";
 
   public OracleDestination() {
     super(DRIVER_CLASS, new OracleNameTransformer(), new OracleOperations("users"));

diff --git a/...st-integration/java/io/airbyte/integrations/destination/oracle/OracleIntegrationTest.java b/...st-integration/java/io/airbyte/integrations/destination/oracle/OracleIntegrationTest.java
@@ -69,7 +69,7 @@ protected JsonNode getConfig() {
   protected List<JsonNode> retrieveRecords(TestDestinationEnv env, String streamName, String namespace, JsonNode streamSchema) throws Exception {
     return retrieveRecordsFromTable(namingResolver.getRawTableName(streamName), namespace)
         .stream()
-        .map(r -> Jsons.deserialize(r.get(OracleDestination.COLUMN_NAME_DATA).asText()))
+        .map(r -> Jsons.deserialize(r.get(OracleDestination.COLUMN_NAME_DATA.replace("\"", "")).asText()))
         .collect(Collectors.toList());
   }
 
@@ -111,10 +111,10 @@ protected List<String> resolveIdentifier(String identifier) {
   }
 
   private List<JsonNode> retrieveRecordsFromTable(String tableName, String schemaName) throws SQLException {
-    List<org.jooq.Record> result = getDatabase().query(ctx -> ctx
-        .fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC", schemaName, tableName, OracleDestination.COLUMN_NAME_EMITTED_AT))
-        .stream()
-        .collect(Collectors.toList()));
+    List<org.jooq.Record> result = getDatabase()
+        .query(ctx -> ctx.fetch(String.format("SELECT * FROM %s.%s ORDER BY %s ASC", schemaName, tableName, OracleDestination.COLUMN_NAME_EMITTED_AT))
+            .stream()
+            .collect(Collectors.toList()));
     return result
         .stream()
         .map(r -> r.formatJSON(JSON_FORMAT))
@@ -165,7 +165,6 @@ protected void tearDown(TestDestinationEnv testEnv) {
 
     final Database database = getDatabase();
     var tables = getAllTables(database);
-    tables.removeAll(allTables);
     try {
       for (String table : tables) {
         database.query(ctx -> {

diff --git a/docs/integrations/destinations/oracle.md b/docs/integrations/destinations/oracle.md
@@ -62,6 +62,7 @@ You should now have all the requirements needed to configure Oracle as a destina
 ## Changelog
 | Version | Date | Pull Request | Subject |
 | :--- | :---  | :--- | :--- |
+| 0.1.7 | 2021-08-30 | [#5746](https://github.com/airbytehq/airbyte/pull/5746) | Use default column name for raw tables |
 | 0.1.6 | 2021-08-23 | [#5542](https://github.com/airbytehq/airbyte/pull/5542) | Remove support for Oracle 11g to allow normalization |
 | 0.1.5 | 2021-08-10 | [#5307](https://github.com/airbytehq/airbyte/pull/5307) | 🐛 Destination Oracle: Fix destination check for users without dba role |
 | 0.1.4 | 2021-07-30 | [#5125](https://github.com/airbytehq/airbyte/pull/5125) | Enable `additionalPropertities` in spec.json |