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 2017/05/10 03:54:27 UTC
[25/43] metamodel git commit: METAMODEL-1123: Fixed. METAMODEL-1124:
Fixed.
METAMODEL-1123: Fixed. METAMODEL-1124: Fixed.
Fixes #132
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/5f09375f
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/5f09375f
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/5f09375f
Branch: refs/heads/5.x
Commit: 5f09375ff7197545f67e9f64982921bfdb8354d7
Parents: 3949af8
Author: Juslwk <i....@gmail.com>
Authored: Thu Oct 13 12:45:25 2016 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Thu Oct 13 12:45:25 2016 -0700
----------------------------------------------------------------------
CHANGES.md | 2 ++
.../org/apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java | 2 +-
.../org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java | 2 +-
.../main/java/org/apache/metamodel/salesforce/SalesforceTable.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f09375f/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index bef1902..236602e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,8 @@
* [METAMODEL-1113] - Fixed support for ColumnNamingStrategy in CSV connector.
* [METAMODEL-1114] - Added support for ColumnNamingStrategy in EBCDIC connector.
* [METAMODEL-1119] - Worked around Hive JDBC driver issues, avoiding non-compliant metadata calls.
+ * [METAMODEL-1123] - Fixed the treatment of a Salesforce.com 'currency' value as a number, not a string.
+ * [METAMODEL-1124] - Fixed the date formatting of date values in MS SQL server.
### Apache MetaModel 4.5.4
http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f09375f/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java
index f261d40..88bed85 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java
@@ -112,7 +112,7 @@ public class SQLServerQueryRewriter extends DefaultQueryRewriter {
final Date date = (Date) operand;
- final DateFormat format = DateUtils.createDateFormat("yyyy-MM-dd HH:mm:ss");
+ final DateFormat format = DateUtils.createDateFormat("yyyyMMdd HH:mm:ss");
final String dateTimeValue = "CAST('" + format.format(date) + "' AS DATETIME)";
sb.append(dateTimeValue);
http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f09375f/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java b/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java
index 9b588ab..7d75dc1 100644
--- a/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java
@@ -87,7 +87,7 @@ public class SQLServerQueryRewriterTest extends TestCase {
.toDate("2014-06-28 14:06:00")));
assertEquals(
- "SELECT MY_SCHEMA.\"foo\".\"bar\", timestamp FROM MY_SCHEMA.\"foo\" WHERE timestamp < CAST('2014-06-28 14:06:00' AS DATETIME)",
+ "SELECT MY_SCHEMA.\"foo\".\"bar\", timestamp FROM MY_SCHEMA.\"foo\" WHERE timestamp < CAST('20140628 14:06:00' AS DATETIME)",
qr.rewriteQuery(q));
}
http://git-wip-us.apache.org/repos/asf/metamodel/blob/5f09375f/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceTable.java
----------------------------------------------------------------------
diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceTable.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceTable.java
index 2df17cc..0c1c113 100644
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceTable.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceTable.java
@@ -105,6 +105,7 @@ final class SalesforceTable extends AbstractTable {
case _int:
return ColumnType.INTEGER;
case _double:
+ case currency:
return ColumnType.DOUBLE;
case date:
return ColumnType.DATE;
@@ -120,7 +121,6 @@ final class SalesforceTable extends AbstractTable {
case textarea:
case encryptedstring:
case base64:
- case currency:
case id:
case picklist:
return ColumnType.VARCHAR;