[6/6] marmotta git commit: Merge branch 'MARMOTTA-640' into develop, closes #20

[wikier]

Merge branch 'MARMOTTA-640' into develop, closes #20


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/db3a593f
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/db3a593f
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/db3a593f

Branch: refs/heads/develop
Commit: db3a593fa0763214a8ee53727f68d78d0b62c5a6
Parents: 45a68a2 b1b899c
Author: Sergio Fernández <wik...@apache.org>
Authored: Mon Jun 20 12:47:53 2016 +0200
Committer: Sergio Fernández <wik...@apache.org>
Committed: Mon Jun 20 12:47:53 2016 +0200

----------------------------------------------------------------------
 .../kiwi/sparql/builder/SQLBuilder.java         | 20 +++-----
 .../builder/collect/PatternCollector.java       |  9 ++--
 .../kiwi/sparql/builder/model/SQLUnion.java     | 10 ++--
 .../optimizer/DistinctLimitOptimizer.java       |  3 +-
 .../sparql/sail/KiWiSparqlSailConnection.java   |  2 +-
 .../kiwi/sparql/test/KiWiSparqlTest.java        | 36 ++++++++++++--
 .../kiwi/sparql/test/MARMOTTA-640_1.sparql      | 33 +++++++++++++
 .../kiwi/sparql/test/MARMOTTA-640_2.sparql      | 51 ++++++++++++++++++++
 8 files changed, 135 insertions(+), 29 deletions(-)
----------------------------------------------------------------------