MARMOTTA-404: backported the trouble maker-fix (cherry picked from commit f14417e35a1582f56266112617bc2a9dc8b74603)
Signed-off-by: Jakob Frank <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/4f30dfab Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/4f30dfab Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/4f30dfab Branch: refs/heads/maintenance-3.1.x Commit: 4f30dfabb1f45f3a7fd5cbb8a23948ef0db58464 Parents: c647881 Author: Sebastian Schaffert <[email protected]> Authored: Wed Dec 11 23:29:07 2013 +0100 Committer: Jakob Frank <[email protected]> Committed: Thu Dec 12 12:26:38 2013 +0100 ---------------------------------------------------------------------- .../org/apache/marmotta/kiwi/persistence/h2/statements.properties | 2 +- .../apache/marmotta/kiwi/persistence/mysql/statements.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/4f30dfab/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties index ebfff11..5058fc8 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/h2/statements.properties @@ -62,7 +62,7 @@ store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES ( #store.triple = INSERT INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?) store.triple = MERGE INTO triples (id,subject,predicate,object,context,inferred,createdAt) KEY(id) VALUES (?,?,?,?,?,?,?) -load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false AND inferred = true +load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false query.size = SELECT count(*) FROM triples WHERE deleted = false AND inferred = false http://git-wip-us.apache.org/repos/asf/marmotta/blob/4f30dfab/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties ---------------------------------------------------------------------- diff --git a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties index a94272a..e50e512 100644 --- a/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties +++ b/libraries/kiwi/kiwi-triplestore/src/main/resources/org/apache/marmotta/kiwi/persistence/mysql/statements.properties @@ -69,7 +69,7 @@ store.tliteral = INSERT INTO nodes (id,ntype,svalue,tvalue,ltype,createdAt store.namespace = INSERT INTO namespaces (id,prefix,uri,createdAt) VALUES (?,?,?,?) store.triple = INSERT IGNORE INTO triples (id,subject,predicate,object,context,inferred,createdAt) VALUES (?,?,?,?,?,?,?) -load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false AND inferred = true +load.triple = SELECT id FROM triples WHERE subject = ? AND predicate = ? AND object = ? AND context = ? AND deleted = false query.size = SELECT count(*) FROM triples WHERE deleted = false AND inferred = false
