Zorba

Merge lp:~zorba-coders/zorba/bug-912579 into lp:zorba

  1. bug-912579
  2. Merge into trunk
Proposed by Cezar Andrei
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 10491
Merged at revision: 10692
Proposed branch: lp:~zorba-coders/zorba/bug-912579
Merge into: lp:zorba
Diff against target: 168 lines (+64/-0)
11 files modified
ChangeLog (+1/-0)
include/zorba/pregenerated/diagnostic_list.h (+2/-0)
modules/com/zorba-xquery/www/modules/pregenerated/errors.xq (+4/-0)
src/diagnostics/diagnostic_en.xml (+4/-0)
src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0)
src/diagnostics/pregenerated/dict_en.cpp (+1/-0)
src/runtime/schema/schema_impl.cpp (+6/-0)
src/store/naive/simple_pul.cpp (+1/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec (+1/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq (+23/-0)
test/rbkt/Queries/zorba/schemas/val-inplace-err2.xsd (+18/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-912579
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Cezar Andrei Approve
Review via email: mp+95259@code.launchpad.net

This proposal supersedes a proposal from 2012-01-06.

Commit message

Fixed bug #912579 (validate-in-place on non-root elements)
Fixed merge of updput primitives
Fixed merge conflict.

Description of the change

Fixed bug #912579 (validate-in-place on non-root elements)
Fixed merge of updput primitives
Fixed merge conflict.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Markos Zaharioudakis (markos-za) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Cezar Andrei (cezar-andrei) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in ChangeLog

Revision history for this message
Cezar Andrei (cezar-andrei) wrote :

Should be good now.

review: Approve
Revision history for this message
Markos Zaharioudakis (markos-za) :
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/bug-912579-2012-03-01T20-50-13.264Z/log.html

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

Validation queue job bug-912579-2012-03-01T20-50-13.264Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2012-02-29 17:15:09 +0000
+++ ChangeLog 2012-02-29 20:57:28 +0000
@@ -56,6 +56,7 @@
56 * Fixed bug #918157 (Add XQFTTS to validation queue)56 * Fixed bug #918157 (Add XQFTTS to validation queue)
57 * Fixed bug with unversioned modules with C++ external functions57 * Fixed bug with unversioned modules with C++ external functions
58 * Fixed bug #878508 (JSON Module not escaping escape characters)58 * Fixed bug #878508 (JSON Module not escaping escape characters)
59 * Fixed bug #912579 (validate-in-place on non-root elements)
5960
60version 2.161version 2.1
6162
6263
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2012-02-16 14:11:02 +0000
+++ include/zorba/pregenerated/diagnostic_list.h 2012-02-29 20:57:28 +0000
@@ -510,6 +510,8 @@
510510
511extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE;511extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE;
512512
513extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0090_CANNOT_VALIDATE_NON_ROOT;
514
513extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZCSE0001_NONEXISTENT_INPUT_FIELD;515extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZCSE0001_NONEXISTENT_INPUT_FIELD;
514516
515extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZCSE0002_INCOMPATIBLE_INPUT_FIELD;517extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZCSE0002_INCOMPATIBLE_INPUT_FIELD;
516518
=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-02-16 14:11:02 +0000
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-02-29 20:57:28 +0000
@@ -321,6 +321,10 @@
321321
322(:~322(:~
323:)323:)
324declare variable $zerr:ZAPI0090 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0090");
325
326(:~
327:)
324declare variable $zerr:ZCSE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZCSE0001");328declare variable $zerr:ZCSE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZCSE0001");
325329
326(:~330(:~
327331
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2012-02-28 20:45:43 +0000
+++ src/diagnostics/diagnostic_en.xml 2012-02-29 20:57:28 +0000
@@ -1832,6 +1832,10 @@
1832 <diagnostic code="ZAPI0080" name="CANNOT_RETRIEVE_NODE_REFERENCE">1832 <diagnostic code="ZAPI0080" name="CANNOT_RETRIEVE_NODE_REFERENCE">
1833 <value>can not retrieve node-reference for a node that is not in a collection.</value>1833 <value>can not retrieve node-reference for a node that is not in a collection.</value>
1834 </diagnostic>1834 </diagnostic>
1835
1836 <diagnostic code="ZAPI0090" name="CANNOT_VALIDATE_NON_ROOT">
1837 <value>a non root element cannot be validated in place.</value>
1838 </diagnostic>
18351839
1836 <!--////////// Zorba Class Serialization Errors ////////////////////////-->1840 <!--////////// Zorba Class Serialization Errors ////////////////////////-->
18371841
18381842
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp 2012-02-16 14:11:02 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2012-02-29 20:57:28 +0000
@@ -744,6 +744,9 @@
744ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE( "ZAPI0080" );744ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE( "ZAPI0080" );
745745
746746
747ZorbaErrorCode ZAPI0090_CANNOT_VALIDATE_NON_ROOT( "ZAPI0090" );
748
749
747ZorbaErrorCode ZCSE0001_NONEXISTENT_INPUT_FIELD( "ZCSE0001" );750ZorbaErrorCode ZCSE0001_NONEXISTENT_INPUT_FIELD( "ZCSE0001" );
748751
749752
750753
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2012-02-28 20:45:43 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp 2012-02-29 20:57:28 +0000
@@ -248,6 +248,7 @@
248 { "ZAPI0042", "iterator is closed" },248 { "ZAPI0042", "iterator is closed" },
249 { "ZAPI0070", "\"$1\": invalid serialization method for SAX" },249 { "ZAPI0070", "\"$1\": invalid serialization method for SAX" },
250 { "ZAPI0080", "can not retrieve node-reference for a node that is not in a collection." },250 { "ZAPI0080", "can not retrieve node-reference for a node that is not in a collection." },
251 { "ZAPI0090", "a non root element cannot be validated in place." },
251 { "ZCSE0001", "\"$1\": nonexistent input field" },252 { "ZCSE0001", "\"$1\": nonexistent input field" },
252 { "ZCSE0002", "\"$1\": incompatible input field${: type=2}${, class=3}" },253 { "ZCSE0002", "\"$1\": incompatible input field${: type=2}${, class=3}" },
253 { "ZCSE0003", "\"$1\": unrecognized class field" },254 { "ZCSE0003", "\"$1\": unrecognized class field" },
254255
=== modified file 'src/runtime/schema/schema_impl.cpp'
--- src/runtime/schema/schema_impl.cpp 2011-10-13 19:44:33 +0000
+++ src/runtime/schema/schema_impl.cpp 2012-02-29 20:57:28 +0000
@@ -93,6 +93,12 @@
9393
94 if (consumeNext(node, theChild.getp(), planState))94 if (consumeNext(node, theChild.getp(), planState))
95 {95 {
96 // verify that if the element being revalidated is an element it is the root
97 if (node->getNodeKind()==store::StoreConsts::elementNode &&
98 node->getParent() &&
99 node->getParent()->getNodeKind()!=store::StoreConsts::documentNode)
100 throw XQUERY_EXCEPTION( zerr::ZAPI0090_CANNOT_VALIDATE_NON_ROOT, ERROR_LOC( loc ) );
101
96 pul = GENV_ITEMFACTORY->createPendingUpdateList();102 pul = GENV_ITEMFACTORY->createPendingUpdateList();
97103
98 pul->addRevalidate(&loc,node);104 pul->addRevalidate(&loc,node);
99105
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp 2012-02-22 16:45:50 +0000
+++ src/store/naive/simple_pul.cpp 2012-02-29 20:57:28 +0000
@@ -1205,6 +1205,7 @@
1205 }1205 }
12061206
1207 thePutList.push_back(otherUpd);1207 thePutList.push_back(otherUpd);
1208 otherUpd->thePul = this;
1208 otherp->thePutList[i] = NULL;1209 otherp->thePutList[i] = NULL;
1209 }1210 }
12101211
12111212
=== added file 'test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec'
--- test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec 2012-02-29 20:57:28 +0000
@@ -0,0 +1,1 @@
1Error: http://www.zorba-xquery.com/errors:ZAPI0090
02
=== added file 'test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq'
--- test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/val-inplace-err2.xq 2012-02-29 20:57:28 +0000
@@ -0,0 +1,23 @@
1import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
2import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";
3import schema namespace d="http://www.zorba-xquery.org/schema" at "val-inplace-err2.xsd";
4
5declare revalidation lax;
6declare construction strip;
7
8declare variable $doc2:=<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9 xmlns="http://www.zorba-xquery.org/schema">
10 <root>
11 <a/>
12 <b/>
13 <c/>
14 </root>
15 <a/>
16 <b/>
17 <c/>
18</root>;
19
20schema:validate-in-place($doc2/d:root);
21
22
23(schema:schema-type($doc2), schema:schema-type($doc2/d:root))
0\ No newline at end of file24\ No newline at end of file
125
=== added file 'test/rbkt/Queries/zorba/schemas/val-inplace-err2.xsd'
--- test/rbkt/Queries/zorba/schemas/val-inplace-err2.xsd 1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/val-inplace-err2.xsd 2012-02-29 20:57:28 +0000
@@ -0,0 +1,18 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
3 targetNamespace="http://www.zorba-xquery.org/schema" xmlns="http://www.zorba-xquery.org/schema"
4 elementFormDefault="qualified">
5
6 <xs:element name="root" type="rootType"/>
7
8 <xs:complexType name="rootType">
9 <xs:sequence>
10 <xs:element name="root" type="rootType" minOccurs="0"/>
11 <xs:element name="a" type="xs:string"/>
12 <xs:element name="b" type="xs:string"/>
13 <xs:element name="c" type="xs:string"/>
14 </xs:sequence>
15 <xs:attribute name="attr" type="xs:string"/>
16 </xs:complexType>
17
18</xs:schema>
0\ No newline at end of file19\ No newline at end of file

Subscribers

People subscribed via source and target branches