Repository: metamodel Updated Branches: refs/heads/master 7ea316f97 -> 88b537c20
METAMODEL-1169 closes apache/metamodel#167 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/88b537c2 Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/88b537c2 Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/88b537c2 Branch: refs/heads/master Commit: 88b537c200d3d4606abd467faf60d9d375726386 Parents: 7ea316f Author: Jakub Neubauer <[email protected]> Authored: Thu Nov 23 07:14:53 2017 +0100 Committer: Dennis Du Krøger <[email protected]> Committed: Thu Nov 23 07:14:53 2017 +0100 ---------------------------------------------------------------------- CHANGES.md | 2 ++ .../apache/metamodel/jdbc/dialects/SQLServerQueryRewriter.java | 2 +- .../apache/metamodel/dialects/SQLServerQueryRewriterTest.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/88b537c2/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index ddd3c9a..cbf22b9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,5 @@ + * [METAMODEL-1169] - Fixed issue with SQL Server milliseconds precision in WHERE + ### Apache MetaModel 5.0 * [METAMODEL-1161] - Fixed issue with maxRows being ignored on Oracle http://git-wip-us.apache.org/repos/asf/metamodel/blob/88b537c2/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/88b537c2/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)); }
