Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

fixed bug in raising XQTY0086 (copying of namespace-sensitive values during node construction)

fixed bug in raising XQTY0086 (copying of namespace-sensitive values during node construction)

[lp:~zorba-coders/zorba/markos-scratch]

11064. By Markos Zaharioudakis on 2013-04-17

fixed bug in raising XQTY0086 (copying of namespace-sensitive values during node construction

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-17T12-46-53.592Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-04-17T12-46-53.592Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-04-16 13:34:59 +0000
+++ ChangeLog	2013-04-17 12:40:44 +0000
@@ -69,6 +69,8 @@
   * Fixed bug #1023168 (Non-single-char-escapes in regex character ranges not
     caught)
   * Throw XQST0048 for groupby clause, as specified by XQuery 3.0.
+  * Fixed bug in raising XQTY0086 (copying of namespace-sensitive values during
+    node construction).
   * Fixed bug #866874 (regex "range subtraction" not supported for ICU)
   * Fixed bug in computing the static type of an allowing-empty FOR variable.
   * Fixed bug #1099648 and #1088886 (XML parsing failures on Red Hat)
 
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2013-04-08 08:54:50 +0000
+++ src/store/naive/node_items.cpp	2013-04-17 12:40:44 +0000
@@ -2517,15 +2517,28 @@
     }
     else // ! nsPreserve
     {
-      if (copymode.theTypePreserve)
+      if (copymode.theTypePreserve && haveTypedValue())
       {
-        store::Item* typeName = getType();
-
-        if (typeName != NULL &&
-            (typeName->equals(GET_STORE().theSchemaTypeNames[store::XS_QNAME]) ||
-             typeName->equals(GET_STORE().theSchemaTypeNames[store::XS_NOTATION])))
-        {
-          throw XQUERY_EXCEPTION(err::XQTY0086);
+        store::Item_t typedValue;
+        store::Iterator_t typedValues;
+        getTypedValue(typedValue, typedValues);
+
+        if (typedValue != NULL)
+        {
+          store::SchemaTypeCode typecode = typedValue->getTypeCode();
+
+          if (typecode == store::XS_QNAME || typecode == store::XS_NOTATION)
+            throw XQUERY_EXCEPTION(err::XQTY0086);
+        }
+        else if (typedValues != NULL)
+        {
+          while (typedValues->next(typedValue))
+          {
+            store::SchemaTypeCode typecode = typedValue->getTypeCode();
+
+            if (typecode == store::XS_QNAME || typecode == store::XS_NOTATION)
+              throw XQUERY_EXCEPTION(err::XQTY0086);
+          }
         }
       }
 
@@ -3991,16 +4004,32 @@
 
   bool isListValue;
 
-  if (parent == rootParent &&
-      typeName != NULL &&
-      (typeName->equals(GET_STORE().theSchemaTypeNames[store::XS_QNAME]) ||
-       typeName->equals(GET_STORE().theSchemaTypeNames[store::XS_NOTATION])))
-  {
-    throw XQUERY_EXCEPTION(err::XQTY0086);
-  }
-
   if (copymode.theTypePreserve)
   {
+    if ((parent == rootParent || copymode.theNsPreserve == false) &&
+        typeName != NULL)
+    {
+      if (theTypedValue->isAtomic())
+      {
+        store::SchemaTypeCode typecode = theTypedValue->getTypeCode();
+
+        if (typecode == store::XS_QNAME || typecode == store::XS_NOTATION)
+          throw XQUERY_EXCEPTION(err::XQTY0086);
+      }
+      else
+      {
+        const std::vector<store::Item_t>& values = getValueVector().getItems();
+        csize numValues = values.size();
+        for (csize i = 0; i < numValues; ++i)
+        {
+          store::SchemaTypeCode typecode = values[i]->getTypeCode();
+
+          if (typecode == store::XS_QNAME || typecode == store::XS_NOTATION)
+            throw XQUERY_EXCEPTION(err::XQTY0086);
+        }
+      }
+    }
+
     typedValue = theTypedValue;
     isListValue = haveListValue();
   }
 
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-17 11:11:24 +0000
+++ test/fots/CMakeLists.txt	2013-04-17 12:40:44 +0000
@@ -239,7 +239,6 @@
 EXPECTED_FOTS_FAILURE (math-acos math-acos-003 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
 EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0093a 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQTY0086_3 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-1 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-2 0)
 EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-3 0)