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/12/20 04:13:52 UTC
[1/2] metamodel git commit: METAMODEL-1176: Fixed
SalesforceDataContext query building
Repository: metamodel
Updated Branches:
refs/heads/master 484cbb1d0 -> e037b0d3f
METAMODEL-1176: Fixed SalesforceDataContext query building
Fixes #175
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/d4112626
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/d4112626
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/d4112626
Branch: refs/heads/master
Commit: d411262672b96d428b40a5ace3af74307b1dbb90
Parents: c7cc4ac
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Dec 19 20:13:13 2017 -0800
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Dec 19 20:13:13 2017 -0800
----------------------------------------------------------------------
CHANGES.md | 1 +
.../org/apache/metamodel/salesforce/SalesforceDataContext.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/d4112626/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 860c0b7..e4efb00 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,7 @@
* [METAMODEL-1173] - Fixed parsing and handling of scalar functions in WHERE clause.
* [METAMODEL-1171] - Fixed parsing of query operators with DATE, TIME, TIMESTAMP prefix to operand date/time values.
* [METAMODEL-1174] - Upgraded Excel module's dependency on Apache POI to latest stable version (3.17).
+ * [METAMODEL-1176] - Fixed issue with bad ArrayList population during SalesforceDataContext query building
### Apache MetaModel 5.0
http://git-wip-us.apache.org/repos/asf/metamodel/blob/d4112626/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
----------------------------------------------------------------------
diff --git a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
index 98b70e3..869b2b5 100644
--- a/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
+++ b/salesforce/src/main/java/org/apache/metamodel/salesforce/SalesforceDataContext.java
@@ -170,7 +170,7 @@ public class SalesforceDataContext extends QueryPostprocessDataContext implement
final List<Column> columns = new ArrayList<>(selectItems.size());
for (SelectItem selectItem : selectItems) {
validateSoqlSupportedSelectItem(selectItem);
- columns.set(i,selectItem.getColumn());
+ columns.add(selectItem.getColumn());
if (i != 0) {
sb.append(", ");
}
[2/2] metamodel git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/metamodel
Posted by ka...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/metamodel
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/e037b0d3
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/e037b0d3
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/e037b0d3
Branch: refs/heads/master
Commit: e037b0d3f22c25148658548f14ed40edf5479290
Parents: d411262 484cbb1
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Dec 19 20:13:29 2017 -0800
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Dec 19 20:13:29 2017 -0800
----------------------------------------------------------------------
CHANGES.md | 1 +
couchdb/pom.xml | 2 +-
.../couchdb/CouchDbDataContextTest.java | 132 ++++++++++++++++---
.../metamodel/couchdb/CouchDbTestCase.java | 96 --------------
.../metamodel/couchdb/CouchDbTestSupport.java | 91 +++++++++++++
5 files changed, 205 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e037b0d3/CHANGES.md
----------------------------------------------------------------------