Zorba

Merge lp:~zorba-coders/zorba/XUDY00021 into lp:zorba

  1. XUDY00021
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Superseded
Proposed branch: lp:~zorba-coders/zorba/XUDY00021
Merge into: lp:zorba
Diff against target: 36 lines (+6/-2)
2 files modified
src/diagnostics/diagnostic_en.xml (+4/-1)
src/diagnostics/pregenerated/dict_en.cpp (+2/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/XUDY00021
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Markos Zaharioudakis Pending
Review via email: mp+93099@code.launchpad.net

Commit message

added error message for XUDY00021 in apply iterator

Description of the change

added error message for XUDY00021 in apply iterator. The error message was lost during the work on generating the dictionary from XML files.

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/XUDY00021-2012-02-14T22-54-59.23Z/log.html

lp:~zorba-coders/zorba/XUDY00021 updated
10660. By Matthias Brantner

readded error message for ~XUDY0021_AppliedAt

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 2 Pending.

lp:~zorba-coders/zorba/XUDY00021 updated
10661. By Matthias Brantner

merge

10662. By Matthias Brantner

- better error message for XUDY0021
- added error locations to XU errors raised during apply-updates

10663. By Matthias Brantner

fix for bugs
- XUDY0021_AppliedAt used without definition (#1052283)
- XUDY0021 has odd error parameter (#867006)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/diagnostics/diagnostic_en.xml'
2--- src/diagnostics/diagnostic_en.xml 2011-12-21 14:40:33 +0000
3+++ src/diagnostics/diagnostic_en.xml 2012-02-14 23:00:24 +0000
4@@ -1307,7 +1307,10 @@
5 [XQuery 1.0 and XPath 2.0 Data Model]. In this case, none of the updates
6 in the query are made effective.
7 </comment>
8- <value>updates violate constraint</value>
9+ <value>updates violate constraint${ 1}</value>
10+ <entry key="AppliedAt">
11+ <value>applied at $2</value>
12+ </entry>
13 </diagnostic>
14
15 <diagnostic code="XUTY0022">
16
17=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
18--- src/diagnostics/pregenerated/dict_en.cpp 2011-12-21 14:40:33 +0000
19+++ src/diagnostics/pregenerated/dict_en.cpp 2012-02-14 23:00:24 +0000
20@@ -203,7 +203,7 @@
21 { "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" },
22 { "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" },
23 { "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" },
24- { "XUDY0021", "updates violate constraint" },
25+ { "XUDY0021", "updates violate constraint${ 1}" },
26 { "XUDY0023", "\"$1\": namespace binding conflicts with $2=$3" },
27 { "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" },
28 { "XUDY0027", "target expression is empty sequence" },
29@@ -660,6 +660,7 @@
30 { "~XQST0106_CONFLICTING", "conflicting" },
31 { "~XQST0106_THE_SAME", "the same" },
32 { "~XQueryVersionAtLeast10_2", "\"$2\": XQuery version must be at least 1.0" },
33+ { "~XUDY0021_AppliedAt", "applied at $2" },
34 { "~XUST0001_CONCAT", "comma expression with updating and non-updating branches" },
35 { "~XUST0001_Generic", "updating expression illegal here" },
36 { "~XUST0001_IF", "conditional expression with updating and non-updating branch" },

Subscribers

People subscribed via source and target branches