Repository: sqoop Updated Branches: refs/heads/sqoop2 e06190b2f -> d6a24fc0b
SQOOP-2833: Sqoop2: Integration Tests: Allow setting which "time type" should be used based on the DatabaseProvider (Abraham Fine via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/d6a24fc0 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/d6a24fc0 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/d6a24fc0 Branch: refs/heads/sqoop2 Commit: d6a24fc0b8b7a9e579b96695d5b45eafdaf0b4dc Parents: e06190b Author: Jarek Jarcec Cecho <[email protected]> Authored: Mon Feb 29 12:32:35 2016 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Mon Feb 29 12:32:35 2016 -0800 ---------------------------------------------------------------------- .../apache/sqoop/common/test/db/DatabaseProvider.java | 11 +++++++++++ .../org/apache/sqoop/common/test/db/MySQLProvider.java | 5 +++++ .../apache/sqoop/common/test/db/SqlServerProvider.java | 5 +++++ .../src/main/java/org/apache/sqoop/test/data/Cities.java | 2 +- .../java/org/apache/sqoop/test/data/UbuntuReleases.java | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6a24fc0/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java ---------------------------------------------------------------------- diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java b/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java index f3efa92..f21f588 100644 --- a/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java +++ b/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java @@ -513,4 +513,15 @@ abstract public class DatabaseProvider { */ public void dropDatabase(String databaseName) { } + + /** + * Different databases handle datetimes/timestamps in different ways. + * + * This is the type we should use when creating schemas. + * + * @return A string representing a SQL datatype + */ + public String getDateTimeType() { + return "timestamp"; + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6a24fc0/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java ---------------------------------------------------------------------- diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java b/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java index 229e8c4..5ae0211 100644 --- a/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java +++ b/common-test/src/main/java/org/apache/sqoop/common/test/db/MySQLProvider.java @@ -116,4 +116,9 @@ public class MySQLProvider extends DatabaseProvider { public String escapeValue(String entity) { return "\'" + entity + "\'"; } + + @Override + public String getDateTimeType() { + return "datetime"; + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6a24fc0/common-test/src/main/java/org/apache/sqoop/common/test/db/SqlServerProvider.java ---------------------------------------------------------------------- diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/db/SqlServerProvider.java b/common-test/src/main/java/org/apache/sqoop/common/test/db/SqlServerProvider.java index b8d037f..b501aec 100644 --- a/common-test/src/main/java/org/apache/sqoop/common/test/db/SqlServerProvider.java +++ b/common-test/src/main/java/org/apache/sqoop/common/test/db/SqlServerProvider.java @@ -90,4 +90,9 @@ public class SqlServerProvider extends DatabaseProvider { public String escape(String entity) { return "[" + entity + "]"; } + + @Override + public String getDateTimeType() { + return "datetime"; + } } http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6a24fc0/test/src/main/java/org/apache/sqoop/test/data/Cities.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/sqoop/test/data/Cities.java b/test/src/main/java/org/apache/sqoop/test/data/Cities.java index 1703397..f2c69bb 100644 --- a/test/src/main/java/org/apache/sqoop/test/data/Cities.java +++ b/test/src/main/java/org/apache/sqoop/test/data/Cities.java @@ -38,7 +38,7 @@ public class Cities extends DataSet { "id", "id", "int", "country", "varchar(50)", - "some_date", "timestamp", + "some_date", provider.getDateTimeType(), "city", "varchar(50)" ); http://git-wip-us.apache.org/repos/asf/sqoop/blob/d6a24fc0/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java b/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java index 9b218e9..7b5d9e5 100644 --- a/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java +++ b/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java @@ -41,7 +41,7 @@ public class UbuntuReleases extends DataSet { "id", "int", "code_name", "varchar(64)", "version", "numeric(4,2)", - "release_date", "timestamp" + "release_date", provider.getDateTimeType() ); return this;
