zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/XUDY00021 into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100

added error message for XUDY00021 in apply iterator
-- 
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93100
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2011-12-21 14:40:33 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-02-14 22:59:19 +0000
@@ -1307,7 +1307,10 @@
        [XQuery 1.0 and XPath 2.0 Data Model]. In this case, none of the updates
        in the query are made effective.
       </comment>
-      <value>updates violate constraint</value>
+      <value>updates violate constraint${ 1}</value>
+      <entry key="AppliedAt">
+        <value>applied at $2</value>
+      </entry>
     </diagnostic>
 
     <diagnostic code="XUTY0022">

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2011-12-21 14:40:33 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-02-14 22:59:19 +0000
@@ -203,7 +203,7 @@
   { "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" },
   { "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" },
   { "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" },
-  { "XUDY0021", "updates violate constraint" },
+  { "XUDY0021", "updates violate constraint${ 1}" },
   { "XUDY0023", "\"$1\": namespace binding conflicts with $2=$3" },
   { "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" },
   { "XUDY0027", "target expression is empty sequence" },
@@ -660,6 +660,7 @@
   { "~XQST0106_CONFLICTING", "conflicting" },
   { "~XQST0106_THE_SAME", "the same" },
   { "~XQueryVersionAtLeast10_2", "\"$2\": XQuery version must be at least 1.0" },
+  { "~XUDY0021_AppliedAt", "applied at $2" },
   { "~XUST0001_CONCAT", "comma expression with updating and non-updating branches" },
   { "~XUST0001_Generic", "updating expression illegal here" },
   { "~XUST0001_IF", "conditional expression with updating and non-updating branch" },