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 2016/09/21 22:57:59 UTC
metamodel git commit: METAMODEL-1118: Fixed
Repository: metamodel
Updated Branches:
refs/heads/master 060884c17 -> b23085b6e
METAMODEL-1118: Fixed
Fixes #129
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/b23085b6
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/b23085b6
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/b23085b6
Branch: refs/heads/master
Commit: b23085b6e3cc74e6ae7a2976ee6854d56fed74ee
Parents: 060884c
Author: kaspersorensen <i....@gmail.com>
Authored: Wed Sep 21 15:57:46 2016 -0700
Committer: kaspersorensen <i....@gmail.com>
Committed: Wed Sep 21 15:57:46 2016 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
.../main/java/org/apache/metamodel/query/DefaultCompiledQuery.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b23085b6/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index f44077e..bda2372 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,6 @@
### Apache MetaModel 4.5.5
+ * [METAMODEL-1118] - Fixed bug pertaining to cloning of FilterItem.LogicalOperator in compiled queries.
* [METAMODEL-1111] - Added WHERE rewrite for Oracle when empty strings are considered as NULL.
* [METAMODEL-1109]�- Fixed diacritics/encoding issue with Fixed Width reader.
* [METAMODEL-1115] - Added support for passing your own PartnerConnection object to the Salesforce.com connector.
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b23085b6/core/src/main/java/org/apache/metamodel/query/DefaultCompiledQuery.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/metamodel/query/DefaultCompiledQuery.java b/core/src/main/java/org/apache/metamodel/query/DefaultCompiledQuery.java
index 4cd497a..12a2529 100644
--- a/core/src/main/java/org/apache/metamodel/query/DefaultCompiledQuery.java
+++ b/core/src/main/java/org/apache/metamodel/query/DefaultCompiledQuery.java
@@ -101,7 +101,7 @@ public class DefaultCompiledQuery implements CompiledQuery {
final FilterItem newChildItem = copyFilterItem(childItem, values, parameterIndex);
newChildItems[i] = newChildItem;
}
- final FilterItem newFilter = new FilterItem(newChildItems);
+ final FilterItem newFilter = new FilterItem(item.getLogicalOperator(), newChildItems);
return newFilter;
} else {
if (item.getOperand() instanceof QueryParameter) {