You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2018/08/25 23:54:18 UTC
[1/4] metamodel git commit: add support for Oracle "TIMESTAMP WITH
(LOCAL_)TIME_ZONE" column type.
Repository: metamodel
Updated Branches:
refs/heads/master 696b9a124 -> a81edae75
add support for Oracle "TIMESTAMP WITH (LOCAL_)TIME_ZONE" column type.
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/3982a589
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/3982a589
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/3982a589
Branch: refs/heads/master
Commit: 3982a589006802e108bcb089ccc79b09a115079d
Parents: 696b9a1
Author: hling <li...@hotmail.com>
Authored: Mon Aug 13 17:21:30 2018 +0800
Committer: hling <li...@hotmail.com>
Committed: Mon Aug 13 17:21:30 2018 +0800
----------------------------------------------------------------------
.../apache/metamodel/jdbc/dialects/OracleQueryRewriter.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/3982a589/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
index 6e667b8..7c3cb61 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
@@ -34,6 +34,15 @@ public class OracleQueryRewriter extends OffsetFetchQueryRewriter {
}
@Override
+ public ColumnType getColumnType(int jdbcType, String nativeType, Integer columnSize) {
+ // For TIMESTAMP WITH LOCAL_TIME_ZONE/TIME_ZONE, which jdbcType is -102/-101
+ if (nativeType.contains("TIMESTAMP")) {
+ return ColumnType.TIMESTAMP;
+ }
+ return super.getColumnType(jdbcType, nativeType, columnSize);
+ }
+
+ @Override
public String rewriteColumnType(ColumnType columnType, Integer columnSize) {
if (columnType == ColumnType.NUMBER || columnType == ColumnType.NUMERIC || columnType == ColumnType.DECIMAL) {
// as one of the only relational databases out there, Oracle has a
[2/4] metamodel git commit: Fixes: Big integer's last some digits
become zero after read.
Posted by ka...@apache.org.
Fixes: Big integer's last some digits become zero after read.
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/a4c18b38
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/a4c18b38
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/a4c18b38
Branch: refs/heads/master
Commit: a4c18b387d6d117d7f75ce8f81ae321e9510bcbc
Parents: 3982a58
Author: hling <li...@hotmail.com>
Authored: Mon Aug 13 18:19:39 2018 +0800
Committer: hling <li...@hotmail.com>
Committed: Mon Aug 13 18:19:39 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/metamodel/util/NumberComparator.java | 4 ++++
.../java/org/apache/metamodel/util/NumberComparatorTest.java | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/a4c18b38/core/src/main/java/org/apache/metamodel/util/NumberComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/util/NumberComparator.java b/core/src/main/java/org/apache/metamodel/util/NumberComparator.java
index 84c1fd2..1c42083 100644
--- a/core/src/main/java/org/apache/metamodel/util/NumberComparator.java
+++ b/core/src/main/java/org/apache/metamodel/util/NumberComparator.java
@@ -136,6 +136,10 @@ public final class NumberComparator implements Comparator<Object> {
} catch (NumberFormatException e) {
}
try {
+ return new BigInteger(stringValue);
+ } catch (NumberFormatException e) {
+ }
+ try {
return Double.parseDouble(stringValue);
} catch (NumberFormatException e) {
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/a4c18b38/core/src/test/java/org/apache/metamodel/util/NumberComparatorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/metamodel/util/NumberComparatorTest.java b/core/src/test/java/org/apache/metamodel/util/NumberComparatorTest.java
index e138607..c416feb 100644
--- a/core/src/test/java/org/apache/metamodel/util/NumberComparatorTest.java
+++ b/core/src/test/java/org/apache/metamodel/util/NumberComparatorTest.java
@@ -50,7 +50,10 @@ public class NumberComparatorTest {
public void testToNumberLong() throws Exception {
assertEquals(4212000000l, NumberComparator.toNumber("4212000000"));
}
-
+ @Test
+ public void testToNumberBigInteger() throws Exception {
+ assertEquals(new BigInteger("42120000000000004212"), NumberComparator.toNumber("42120000000000004212"));
+ }
@Test
public void testToNumberDouble() throws Exception {
assertEquals(42.12, NumberComparator.toNumber("42.12"));
[4/4] metamodel git commit: METAMODEL-1192: Updated CHANGES.md
Posted by ka...@apache.org.
METAMODEL-1192: Updated CHANGES.md
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/a81edae7
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/a81edae7
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/a81edae7
Branch: refs/heads/master
Commit: a81edae7582f8a7a4ef3d5d73d1dcf24b1d541ac
Parents: 44750f2
Author: Kasper Sørensen <i....@gmail.com>
Authored: Sat Aug 25 16:54:06 2018 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Sat Aug 25 16:54:06 2018 -0700
----------------------------------------------------------------------
CHANGES.md | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/a81edae7/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 96b7c10..d90ef6f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,7 @@
+### Apache MetaModel 5.1.1 (WIP)
+
+ * [METAMODEL-1192] - Add support for Oracle "TIMESTAMP WITH (LOCAL_)TIME_ZONE" column type.
+
### Apache MetaModel 5.1.0
* [METAMODEL-1188] - Added write-support for the Apache HBase connector.
[3/4] metamodel git commit: Follow Coding guidelines,
replace Tabs with spaces.
Posted by ka...@apache.org.
Follow Coding guidelines, replace Tabs with spaces.
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/44750f21
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/44750f21
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/44750f21
Branch: refs/heads/master
Commit: 44750f218d6a1c3eaa06f9ee0eeb944c5dc9aa64
Parents: a4c18b3
Author: hling <li...@hotmail.com>
Authored: Wed Aug 15 09:01:37 2018 +0800
Committer: hling <li...@hotmail.com>
Committed: Wed Aug 15 09:01:37 2018 +0800
----------------------------------------------------------------------
.../metamodel/jdbc/dialects/OracleQueryRewriter.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/44750f21/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
index 7c3cb61..1272a26 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/OracleQueryRewriter.java
@@ -34,13 +34,13 @@ public class OracleQueryRewriter extends OffsetFetchQueryRewriter {
}
@Override
- public ColumnType getColumnType(int jdbcType, String nativeType, Integer columnSize) {
- // For TIMESTAMP WITH LOCAL_TIME_ZONE/TIME_ZONE, which jdbcType is -102/-101
- if (nativeType.contains("TIMESTAMP")) {
- return ColumnType.TIMESTAMP;
- }
- return super.getColumnType(jdbcType, nativeType, columnSize);
- }
+ public ColumnType getColumnType(int jdbcType, String nativeType, Integer columnSize) {
+ // For TIMESTAMP WITH LOCAL_TIME_ZONE/TIME_ZONE, which jdbcType is -102/-101
+ if (nativeType.contains("TIMESTAMP")) {
+ return ColumnType.TIMESTAMP;
+ }
+ return super.getColumnType(jdbcType, nativeType, columnSize);
+ }
@Override
public String rewriteColumnType(ColumnType columnType, Integer columnSize) {