1
0
mirror of synced 2025-12-25 02:09:19 -05:00

Revert "DAT: verify that a destination is able to write any ISO8601-compliant date string (#9816)" (#11802)

This reverts commit 2f850b98ac.
This commit is contained in:
Yurii Bidiuk
2022-04-08 19:39:40 +03:00
committed by GitHub
parent ceef3e3f01
commit af1d087d22
30 changed files with 12 additions and 1697 deletions

View File

@@ -4,26 +4,18 @@
package io.airbyte.integrations.destination.postgres;
import static io.airbyte.integrations.standardtest.destination.DateTimeUtils.DATE;
import static io.airbyte.integrations.standardtest.destination.DateTimeUtils.DATE_TIME;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableMap;
import io.airbyte.commons.json.Jsons;
import io.airbyte.db.Databases;
import io.airbyte.db.jdbc.JdbcUtils;
import io.airbyte.integrations.base.JavaBaseConstants;
import io.airbyte.integrations.destination.ExtendedNameTransformer;
import io.airbyte.integrations.standardtest.destination.DateTimeUtils;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.testcontainers.containers.PostgreSQLContainer;
public class PostgresDestinationAcceptanceTest extends DestinationAcceptanceTest {
@@ -130,7 +122,6 @@ public class PostgresDestinationAcceptanceTest extends DestinationAcceptanceTest
protected void setup(final TestDestinationEnv testEnv) {
db = new PostgreSQLContainer<>("postgres:13-alpine");
db.start();
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
}
@Override
@@ -139,27 +130,4 @@ public class PostgresDestinationAcceptanceTest extends DestinationAcceptanceTest
db.close();
}
@Override
public boolean requiresDateTimeConversionForNormalizedSync() {
return true;
}
@Override
public void convertDateTime(ObjectNode data, Map<String, String> dateTimeFieldNames) {
if (dateTimeFieldNames.keySet().isEmpty()) {
return;
}
for (String path : dateTimeFieldNames.keySet()) {
if (isOneLevelPath(path) && !data.at(path).isMissingNode() && DateTimeUtils.isDateTimeValue(data.at(path).asText())) {
var key = path.replace("/", StringUtils.EMPTY);
switch (dateTimeFieldNames.get(path)) {
case DATE_TIME -> data.put(key.toLowerCase(),
DateTimeUtils.convertToPostgresFormat(data.at(path).asText()));
case DATE -> data.put(key.toLowerCase(),
DateTimeUtils.convertToDateFormat(data.at(path).asText()));
}
}
}
}
}

View File

@@ -4,9 +4,6 @@
package io.airbyte.integrations.destination.postgres;
import static io.airbyte.integrations.standardtest.destination.DateTimeUtils.DATE;
import static io.airbyte.integrations.standardtest.destination.DateTimeUtils.DATE_TIME;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.airbyte.commons.functional.CheckedFunction;
@@ -18,15 +15,11 @@ import io.airbyte.integrations.base.JavaBaseConstants;
import io.airbyte.integrations.base.ssh.SshBastionContainer;
import io.airbyte.integrations.base.ssh.SshTunnel;
import io.airbyte.integrations.destination.ExtendedNameTransformer;
import io.airbyte.integrations.standardtest.destination.DateTimeUtils;
import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.stream.Collectors;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.testcontainers.containers.PostgreSQLContainer;
// todo (cgardens) - likely some of this could be further de-duplicated with
@@ -124,7 +117,6 @@ public abstract class SshPostgresDestinationAcceptanceTest extends DestinationAc
}
private List<JsonNode> retrieveRecordsFromTable(final String tableName, final String schemaName) throws Exception {
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
final JsonNode config = getConfig();
return SshTunnel.sshWrap(
config,
@@ -179,27 +171,4 @@ public abstract class SshPostgresDestinationAcceptanceTest extends DestinationAc
bastion.stopAndCloseContainers(db);
}
@Override
public boolean requiresDateTimeConversionForNormalizedSync() {
return true;
}
@Override
public void convertDateTime(ObjectNode data, Map<String, String> dateTimeFieldNames) {
if (dateTimeFieldNames.keySet().isEmpty()) {
return;
}
for (String path : dateTimeFieldNames.keySet()) {
if (isOneLevelPath(path) && !data.at(path).isMissingNode() && DateTimeUtils.isDateTimeValue(data.at(path).asText())) {
var key = path.replace("/", StringUtils.EMPTY);
switch (dateTimeFieldNames.get(path)) {
case DATE_TIME -> data.put(key.toLowerCase(),
DateTimeUtils.convertToPostgresFormat(data.at(path).asText()));
case DATE -> data.put(key.toLowerCase(),
DateTimeUtils.convertToDateFormat(data.at(path).asText()));
}
}
}
}
}