You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2015/04/08 19:05:18 UTC
marmotta git commit: MARMOTTA-608: simple patch for avoiding project
empty expressions
Repository: marmotta
Updated Branches:
refs/heads/develop 4708f4865 -> 8ac1d06c6
MARMOTTA-608: simple patch for avoiding project empty expressions
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8ac1d06c
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8ac1d06c
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8ac1d06c
Branch: refs/heads/develop
Commit: 8ac1d06c62fde2a71456be4a3ad401fe5432890a
Parents: 4708f48
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Apr 8 19:05:03 2015 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Apr 8 19:05:03 2015 +0200
----------------------------------------------------------------------
.../org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/8ac1d06c/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
index 3e64836..933fdda 100644
--- a/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
+++ b/libraries/kiwi/kiwi-sparql/src/main/java/org/apache/marmotta/kiwi/sparql/builder/SQLBuilder.java
@@ -619,13 +619,16 @@ public class SQLBuilder {
for(SQLVariable v : vars) {
if(v.getProjectionType() != ValueType.NONE && (projectedVars.isEmpty() || projectedVars.contains(v.getSparqlName()))) {
String projectedName = v.getName();
- String fromName = v.getExpressions().get(0);
- projections.add(fromName + " AS " + projectedName);
+ if (v.getExpressions() != null && v.getExpressions().size() > 0) {
+ String fromName = v.getExpressions().get(0);
+ projections.add(fromName + " AS " + projectedName);
+ }
if(v.getLiteralTypeExpression() != null) {
projections.add(v.getLiteralTypeExpression() + " AS " + projectedName + "_TYPE");
}
+
if(v.getLiteralLangExpression() != null) {
projections.add(v.getLiteralLangExpression() + " AS " + projectedName + "_LANG");
}