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/07/27 01:49:30 UTC
[7/7] metamodel git commit: Merge branch 'master' into
feature/fasterJoin
Merge branch 'master' into feature/fasterJoin
Conflicts:
CHANGES.md
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/b08aec1d
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/b08aec1d
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/b08aec1d
Branch: refs/heads/master
Commit: b08aec1dcc54dc0bcb4ff42e0cd1411d6ec0e15b
Parents: ddfa13e d841acc
Author: Kasper Sørensen <i....@gmail.com>
Authored: Wed Jul 26 18:49:03 2017 -0700
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Wed Jul 26 18:49:03 2017 -0700
----------------------------------------------------------------------
CHANGES.md | 1 +
README.md | 78 ++++++-------
.../factory/DataContextPropertiesImpl.java | 3 +
jdbc/pom.xml | 4 +
.../metamodel/jdbc/JdbcMetadataLoader.java | 92 +++++++++++----
.../jdbc/dialects/DefaultQueryRewriter.java | 24 ++--
.../jdbc/dialects/HsqldbQueryRewriter.java | 13 +++
.../apache/metamodel/jdbc/H2databaseTest.java | 104 +++++++++++------
.../org/apache/metamodel/jdbc/HsqldbTest.java | 115 ++++++++++++++-----
.../apache/metamodel/pojo/PojoDataContext.java | 4 +-
.../metamodel/pojo/PojoDataContextFactory.java | 71 ++++++++++++
....apache.metamodel.factory.DataContextFactory | 1 +
pom.xml | 84 ++++++++++++--
spring/pom.xml | 12 --
14 files changed, 452 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b08aec1d/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index 2a5aa51,1b8361c..f5cb59a
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -7,7 -7,7 +7,8 @@@
* [METAMODEL-1139] - Employed Java 8 functional types (java.util.function) in favor of (now deprecated) Ref, Action, Func.
* [METAMODEL-1140] - Allowed SalesforceDataContext without a security token.
* [METAMODEL-1141] - Added RFC 4180 compliant CSV parsing.
+ * [METAMODEL-1144] - Optimized evaluation of conditional client-side JOIN statements.
+ * [METAMODEL-1145] - Fixed bug with modelling JDBC table relationships when there are multiple keys involved in the relationship.
### Apache MetaModel 4.6.0
http://git-wip-us.apache.org/repos/asf/metamodel/blob/b08aec1d/README.md
----------------------------------------------------------------------
diff --cc README.md
index e5cf17a,e5cf17a..3156d74
--- a/README.md
+++ b/README.md
@@@ -1,40 -1,40 +1,40 @@@
--## Apache MetaModel
--
--MetaModel is a data access framework, providing a common interface for exploration and querying of different types of datastores.
--
--<div>
--<img src="http://metamodel.apache.org/img/logo.png" style="float: right; margin-left: 20px;" alt="MetaModel logo" />
--</div>
--
--### Mailing lists
--
-- * Developer list: dev@metamodel.apache.org
-- * User list: user@metamodel.apache.org
-- * Commits list: commits@metamodel.apache.org
--
--### Website
--
--http://metamodel.apache.org/
--
--### Documentation
--
--Please check out our [wiki for user documentation](https://cwiki.apache.org/confluence/display/METAMODEL).
--
--### Building the code
--
--MetaModel uses maven as it's build tool. Code can be built with:
--
--```
--mvn clean install
--```
--
--### Running the integration tests
--
-- 1. Copy the file 'example-metamodel-integrationtest-configuration.properties' to your user home.
-- 2. Remove the 'example-' prefix from its filename
-- 3. Modify the file to enable properties of the integration tests that you're interested in.
-- 4. Re-run "mvn clean install".
--
--### Contributing
--
++## Apache MetaModel
++
++MetaModel is a data access framework, providing a common interface for exploration and querying of different types of datastores.
++
++<div>
++<img src="http://metamodel.apache.org/img/logo.png" style="float: right; margin-left: 20px;" alt="MetaModel logo" />
++</div>
++
++### Mailing lists
++
++ * Developer list: dev@metamodel.apache.org
++ * User list: user@metamodel.apache.org
++ * Commits list: commits@metamodel.apache.org
++
++### Website
++
++http://metamodel.apache.org/
++
++### Documentation
++
++Please check out our [wiki for user documentation](https://cwiki.apache.org/confluence/display/METAMODEL).
++
++### Building the code
++
++MetaModel uses maven as it's build tool. Code can be built with:
++
++```
++mvn clean install
++```
++
++### Running the integration tests
++
++ 1. Copy the file 'example-metamodel-integrationtest-configuration.properties' to your user home.
++ 2. Remove the 'example-' prefix from its filename
++ 3. Modify the file to enable properties of the integration tests that you're interested in.
++ 4. Re-run "mvn clean install".
++
++### Contributing
++
Please see [CONTRIBUTE.md](CONTRIBUTE.md)