Repository: metamodel Updated Branches: refs/heads/4.6.x c0199f5d7 -> f696c106a
METAMODEL-1169: Fixed Closes #168 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/449aa70c Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/449aa70c Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/449aa70c Branch: refs/heads/4.6.x Commit: 449aa70cadbe3cd893683aed55ca6cec2cb33120 Parents: c0199f5 Author: Kasper Sørensen <[email protected]> Authored: Thu Nov 23 11:40:47 2017 -0800 Committer: Kasper Sørensen <[email protected]> Committed: Thu Nov 23 11:40:47 2017 -0800 ---------------------------------------------------------------------- .../apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java | 2 +- .../apache/metamodel/dialects/SQLServerQueryRewriterTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/449aa70c/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 4c7e588..3fdcf0e 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 @@ -114,7 +114,7 @@ public class SQLServerQueryRewriter extends OffsetFetchQueryRewriter { final Date date = (Date) operand; - final DateFormat format = DateUtils.createDateFormat("yyyyMMdd HH:mm:ss"); + final DateFormat format = DateUtils.createDateFormat("yyyyMMdd HH:mm:ss.SSS"); final String dateTimeValue = "CAST('" + format.format(date) + "' AS DATETIME)"; sb.append(dateTimeValue); http://git-wip-us.apache.org/repos/asf/metamodel/blob/449aa70c/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 f160036..ca07d13 100644 --- a/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java +++ b/jdbc/src/test/java/org/apache/metamodel/dialects/SQLServerQueryRewriterTest.java @@ -122,10 +122,10 @@ public class SQLServerQueryRewriterTest extends TestCase { .select(column) .select(timestampColumn) .where(new FilterItem(new SelectItem(timestampColumn), OperatorType.LESS_THAN, TimeComparator - .toDate("2014-06-28 14:06:00"))); + .toDate("2014-06-28 14:06:00.123"))); assertEquals( - "SELECT MY_SCHEMA.\"foo\".\"bar\", timestamp FROM MY_SCHEMA.\"foo\" WHERE timestamp < CAST('20140628 14:06:00' AS DATETIME)", + "SELECT MY_SCHEMA.\"foo\".\"bar\", timestamp FROM MY_SCHEMA.\"foo\" WHERE timestamp < CAST('20140628 14:06:00.123' AS DATETIME)", qr.rewriteQuery(q)); }
