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

[Markos Zaharioudakis]

Fixed bug #1002993 (bug during revalidation after update due to improper condition for calling TypeOps::get_atomic_type_code() from SchemaValidatorImpl::isPossibleSimpleContentRevalImpl())

Fixed bug #1002993 (bug during revalidation after update due to improper condition for calling TypeOps::get_atomic_type_code() from SchemaValidatorImpl::isPossibleSimpleContentRevalImpl())

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1002993-2012-06-01T08-43-02.506Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1002993-2012-06-01T08-43-02.506Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

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

[Markos Zaharioudakis (markos-za)]

review: Approve

[Cezar Andrei (cezar-andrei)]

It's fine.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

text conflict in ChangeLog

[Zorba Build Bot (zorba-buildbot)]

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

text conflict in ChangeLog

[lp:~zorba-coders/zorba/bug-1002993]

10870. By Markos Zaharioudakis on 2012-07-11

merge from trunk

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1002993-2012-07-11T05-02-50.735Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1002993-2012-07-11T05-02-50.735Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-07-10 06:28:46 +0000
+++ ChangeLog	2012-07-11 04:57:23 +0000
@@ -10,7 +10,8 @@
   * Added ft:tokenize-nodes() function to full-text module
   * New XQuery 3.0 functions
     - fn:parse-xml-fragment#1
-  * Added support for transient maps to the http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
+  * Added support for transient maps to the
+    http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
   * Added support for fragments to fn:path
   * Positional pagination support for collections
 
@@ -24,6 +25,9 @@
   * Big rewrite of plan serializer internals, resulting in big performance improvement.
 
 Bug Fixes/Other Changes:
+  * Fixed bug #1002993 (bug during revalidation after update; improper condition
+    for calling TypeOps::get_atomic_type_code() from
+    SchemaValidatorImpl::isPossibleSimpleContentRevalImpl())
   * Fixed bug #867357 (Improved parser error messages)
   * Fixed bug #932314 (non-comparable values must be treated as distinct by
     fn:distinct-values)
@@ -35,7 +39,7 @@
   * Fixed bug #1003023$ (optimizer problems due to common subexpression after
     var folding into if-then-else)
   * Fixed bug #1006166 (disabling 2 functions with the same qname)
-  * Fixed bug 960083$ (improper error handling of NaN comparisons)
+  * Fixed bug #960083 (improper error handling of NaN comparisons)
   * Xml-format plan serialization not supported anymore.
 
 

=== modified file 'src/types/schema/revalidateUtils.cpp'
--- src/types/schema/revalidateUtils.cpp	2012-06-28 04:14:03 +0000
+++ src/types/schema/revalidateUtils.cpp	2012-07-11 04:57:23 +0000
@@ -580,7 +580,7 @@
 }
   
 bool SchemaValidatorImpl::isPossibleSimpleContentRevalidation(
-    store::Item *typeQName)
+    store::Item* typeQName)
 {
   TypeManager* typeManager = theSctx->get_typemanager();
   
@@ -604,7 +604,7 @@
 {
   if ( schemaType->content_kind() == XQType::SIMPLE_CONTENT_KIND )
   {
-    if (schemaType->is_builtin())
+    if (schemaType->type_kind() == XQType::ATOMIC_TYPE_KIND)
     {
       store::SchemaTypeCode schemaTypeCode = 
           TypeOps::get_atomic_type_code(*schemaType);

=== added file 'test/rbkt/ExpQueryResults/zorba/updates/upd14.xml.res'
--- test/rbkt/ExpQueryResults/zorba/updates/upd14.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/updates/upd14.xml.res	2012-07-11 04:57:23 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ok

=== added file 'test/rbkt/Queries/zorba/updates/forms.xsd'
--- test/rbkt/Queries/zorba/updates/forms.xsd	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/updates/forms.xsd	2012-07-11 04:57:23 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema targetNamespace="http://www.evaluescience.com/schemas/forms"
+           xmlns = "http://www.evaluescience.com/schemas/forms"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+
+    <xs:complexType name="Form">
+     <xs:sequence>
+      <xs:any namespace="##targetNamespace" minOccurs="0"
+       maxOccurs="unbounded">
+      </xs:any>
+     </xs:sequence>
+    </xs:complexType>
+
+      <xs:element name="form" type="Form"></xs:element>
+
+    <xs:complexType name="Hidden">
+      <xs:attribute name="name" type="xs:string" use="required"></xs:attribute>
+      <xs:attribute name="value" type="xs:anySimpleType" use="optional" />
+    </xs:complexType>
+
+    <xs:element name="hidden" type="Hidden"></xs:element>
+
+</xs:schema>

=== added file 'test/rbkt/Queries/zorba/updates/upd14.xq'
--- test/rbkt/Queries/zorba/updates/upd14.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/updates/upd14.xq	2012-07-11 04:57:23 +0000
@@ -0,0 +1,19 @@
+import schema namespace f = "http://www.evaluescience.com/schemas/forms" at "forms.xsd";
+
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+
+declare %an:no-cache %an:sequential function local:test2() 
+{
+   variable $form := validate strict {
+     <f:form>
+       <f:hidden name="myid" value="3"/>
+     </f:form>
+   };
+
+   replace value of node $form/f:hidden/@value with "hello";
+
+   "ok"
+};
+
+
+local:test2()