[MIN] XQuery Update: improved error message

BaseXdb · Mar 2, 2015 · 9123cae · 9123cae
1 parent 5c8c9f1
commit 9123cae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/basex-core/src/main/java/org/basex/query/QueryError.java b/basex-core/src/main/java/org/basex/query/QueryError.java
@@ -1176,7 +1176,7 @@ public enum QueryError {
   /** XUDY0016. */
   UPMULTREPL_X(XUDY, 16, "Node can only be replaced once: %."),
   /** XUDY0016. */
-  UPMULTDOC_X(XUDY, 16, "Document can only be replaced once: %."),
+  UPMULTDOC_X_X(XUDY, 16, "Document can only be replaced once: %/%."),
   /** XUDY0017. */
   UPMULTREPV_X(XUDY, 17, "Node can only be replaced once: %"),
   /** XUDY0021. */

diff --git a/basex-core/src/main/java/org/basex/query/func/db/DbReplace.java b/basex-core/src/main/java/org/basex/query/func/db/DbReplace.java
@@ -44,6 +44,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
       final NewInput input = checkInput(item, token(path));
       if(docs.isEmpty() || docs.get(0) == 0) {
         // no replacement of first document (because of TableDiskAccess#insert, used > 0, pre = 0)
+        // open issue: UPMULTDOC_X_X not raised when adding documents
         updates.add(new DBAdd(data, input, opts, qc, info), qc);
       } else {
         updates.add(new ReplaceDoc(docs.get(0), data, input, opts, qc, info), qc);

diff --git a/basex-core/src/main/java/org/basex/query/up/primitives/node/ReplaceDoc.java b/basex-core/src/main/java/org/basex/query/up/primitives/node/ReplaceDoc.java
@@ -49,7 +49,7 @@ public void prepare(final MemData tmp) throws QueryException {
 
   @Override
   public void merge(final Update update) throws QueryException {
-    throw UPMULTDOC_X.get(info, replace.inputs.get(0).path);
+    throw UPMULTDOC_X_X.get(info, data.meta.name, replace.inputs.get(0).path);
   }
 
   @Override