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

[Markos Zaharioudakis]

Fixed bug #1061222 (bad message for errors in index key type declaration)

Fixed bug #1061222 (bad message for errors in index key type declaration)

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

10962. By Markos Zaharioudakis on 2012-10-09

Fixed bug #1061222

[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-2012-10-09T15-04-54.444Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2012-10-09T15-04-54.444Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-10-08 12:09:36 +0000
+++ ChangeLog	2012-10-09 15:01:23 +0000
@@ -11,6 +11,7 @@
   * Fixed mustcopyInputNodes() method of no-copy, and jsoniq functions.
   * Fixed bug #1062093 (bug in var reference iterators with an associated
     position that is negative)
+  * Fixed bug #1061222 (bad message for errors in index key type declaration)
 
 
 version 2.7

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-10-09 14:06:08 +0000
+++ src/compiler/translator/translator.cpp	2012-10-09 15:01:23 +0000
@@ -4660,7 +4660,8 @@
       if (!index->isGeneral())
       {
         RAISE_ERROR(zerr::ZDST0027_INDEX_BAD_KEY_TYPE, kloc,
-        ERROR_PARAMS(index->getName()->getStringValue()));
+        ERROR_PARAMS(index->getName()->getStringValue(),
+                     ZED(ZDST0027_NO_KEY_TYPE_DECL)));
       }
     }
     else
@@ -4672,7 +4673,17 @@
       if (!TypeOps::is_subtype(tm, *ptype, *theRTM.ANY_ATOMIC_TYPE_STAR, kloc))
       {
         RAISE_ERROR(zerr::ZDST0027_INDEX_BAD_KEY_TYPE, kloc,
-        ERROR_PARAMS(index->getName()->getStringValue()));
+        ERROR_PARAMS(index->getName()->getStringValue(),
+                     ZED(ZDST0027_NON_ATOMIC_KEY_TYPE)));
+      }
+
+      if (!index->isGeneral() &&
+          quant != TypeConstants::QUANT_ONE &&
+          quant != TypeConstants::QUANT_QUESTION)
+      {
+        RAISE_ERROR(zerr::ZDST0027_INDEX_BAD_KEY_TYPE, kloc,
+        ERROR_PARAMS(index->getName()->getStringValue(),
+                     ZED(ZDST0027_MULTI_VALUED_KEY_TYPE_DECL)));
       }
 
       if (!index->isGeneral() &&
@@ -4680,15 +4691,8 @@
            TypeOps::is_equal(tm, *ptype, *theRTM.UNTYPED_ATOMIC_TYPE_ONE, kloc)))
       {
         RAISE_ERROR(zerr::ZDST0027_INDEX_BAD_KEY_TYPE, kloc,
-        ERROR_PARAMS(index->getName()->getStringValue()));
-      }
-
-      if (!index->isGeneral() &&
-          quant != TypeConstants::QUANT_ONE &&
-          quant != TypeConstants::QUANT_QUESTION)
-      {
-        RAISE_ERROR(zerr::ZDST0027_INDEX_BAD_KEY_TYPE, kloc,
-        ERROR_PARAMS(index->getName()->getStringValue()));
+        ERROR_PARAMS(index->getName()->getStringValue(),
+                     ZED(ZDST0027_NON_SPECIFIC_KEY_TYPE_DECL)));
       }
 
       if (index->getMethod() == IndexDecl::TREE &&
@@ -4704,7 +4708,9 @@
            TypeOps::is_subtype(tm, *ptype, *theRTM.GDAY_TYPE_ONE, kloc)))
       {
         RAISE_ERROR(zerr::ZDST0027_INDEX_BAD_KEY_TYPE, kloc,
-        ERROR_PARAMS(index->getName()->getStringValue()));
+        ERROR_PARAMS(index->getName()->getStringValue(),
+                     ZED(ZDST0027_NON_ORDERED_KEY_TYPE),
+                     ptype->toSchemaString()));
       }
 
       keyExpr = wrap_in_type_match(keyExpr,

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-10-08 12:09:36 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-10-09 15:01:23 +0000
@@ -2257,7 +2257,29 @@
     </diagnostic>
 
     <diagnostic code="ZDST0027" name="INDEX_BAD_KEY_TYPE">
-      <value>"$1": index bad key type</value>
+
+      <value>"$1": $2</value>
+
+      <entry key="NO_KEY_TYPE_DECL">
+        <value>value index missing key type declaration</value>
+      </entry>
+
+      <entry key="NON_SPECIFIC_KEY_TYPE_DECL">
+        <value>value index can not have xs:untypedAtomic or xs:anyAtomicType in key type declaration</value>
+      </entry>
+
+      <entry key="MULTI_VALUED_KEY_TYPE_DECL">
+        <value>value index can not have a key type declaration with * or + quantifier</value>
+      </entry>
+
+      <entry key="NON_ATOMIC_KEY_TYPE">
+        <value>index has non-atomic key type declaration</value>
+      </entry>
+
+      <entry key="NON_ORDERED_KEY_TYPE">
+        <value>range index can not have type $3 in key type declaration</value>
+      </entry>
+
     </diagnostic>
 
     <diagnostic code="ZDST0028" name="INDEX_NOT_DETERMINISTIC">

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2012-10-08 12:09:36 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-10-09 15:01:23 +0000
@@ -387,7 +387,7 @@
   { "ZDST0024", "index multiple property values" },
   { "ZDST0025", "\"$1\": index cannot be declared as unique" },
   { "ZDST0026", "index invalid property value" },
-  { "ZDST0027", "\"$1\": index bad key type" },
+  { "ZDST0027", "\"$1\": $2" },
   { "ZDST0028", "\"$1\": index not deterministic" },
   { "ZDST0029", "\"$1\": index invalid data source" },
   { "ZDST0030", "\"$1\": index non-constant data source" },
@@ -887,6 +887,11 @@
   { "~XUST0001_UDF_2", "\"$2\": function declared simple but body is updating" },
   { "~XUST0002_Transform", "transform expression witn non-updating or vacuous modify clause" },
   { "~XUST0002_UDF_2", "\"$2\": function declared updating but body is not updating or vacuous" },
+  { "~ZDST0027_MULTI_VALUED_KEY_TYPE_DECL", "value index can not have a key type declaration with * or + quantifier" },
+  { "~ZDST0027_NON_ATOMIC_KEY_TYPE", "index has non-atomic key type declaration" },
+  { "~ZDST0027_NON_ORDERED_KEY_TYPE", "range index can not have type $3 in key type declaration" },
+  { "~ZDST0027_NON_SPECIFIC_KEY_TYPE_DECL", "value index can not have xs:untypedAtomic or xs:anyAtomicType in key type declaration" },
+  { "~ZDST0027_NO_KEY_TYPE_DECL", "value index missing key type declaration" },
   { "~ZDST0060_unknown_localname", "unknown localname ($3)" },
   { "~ZDST0060_unknown_namespace", "unknown namespace ($3)" },
   { "~ZWST0005_PARAM_TYPE", "type of parameter $3 is $4 which is not a subtype of xs:anyAtomicType" },

=== added file 'test/rbkt/Queries/zorba/xqddf/error_01.spec'
--- test/rbkt/Queries/zorba/xqddf/error_01.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_01.spec	2012-10-09 15:01:23 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZDST0027

=== added file 'test/rbkt/Queries/zorba/xqddf/error_01.xq'
--- test/rbkt/Queries/zorba/xqddf/error_01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_01.xq	2012-10-09 15:01:23 +0000
@@ -0,0 +1,6 @@
+import module namespace error = "http://www.example.com/error" at "error_01.xqlib";
+
+declare namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+
+
+ddl:create($error:collection);

=== added file 'test/rbkt/Queries/zorba/xqddf/error_01.xqlib'
--- test/rbkt/Queries/zorba/xqddf/error_01.xqlib	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_01.xqlib	2012-10-09 15:01:23 +0000
@@ -0,0 +1,17 @@
+
+module namespace error = "http://www.example.com/error";
+
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+
+
+import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+
+
+declare collection error:collection as node()*;
+
+declare variable $error:coll := xs:QName("error:collection");
+
+
+declare %an:automatic %an:value-equality index error:index
+on nodes dml:collection(xs:QName("error:collection"))
+by string(@id);

=== added file 'test/rbkt/Queries/zorba/xqddf/error_02.spec'
--- test/rbkt/Queries/zorba/xqddf/error_02.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_02.spec	2012-10-09 15:01:23 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZDST0027

=== added file 'test/rbkt/Queries/zorba/xqddf/error_02.xq'
--- test/rbkt/Queries/zorba/xqddf/error_02.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_02.xq	2012-10-09 15:01:23 +0000
@@ -0,0 +1,6 @@
+import module namespace error = "http://www.example.com/error" at "error_02.xqlib";
+
+declare namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+
+
+ddl:create($error:collection);

=== added file 'test/rbkt/Queries/zorba/xqddf/error_02.xqlib'
--- test/rbkt/Queries/zorba/xqddf/error_02.xqlib	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_02.xqlib	2012-10-09 15:01:23 +0000
@@ -0,0 +1,16 @@
+module namespace error = "http://www.example.com/error";
+
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+
+
+import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+
+
+declare collection error:collection as node()*;
+
+declare variable $error:coll := xs:QName("error:collection");
+
+
+declare %an:automatic %an:value-range index error:index
+on nodes dml:collection(xs:QName("error:collection"))
+by xs:hexBinary(@id) as xs:hexBinary;

=== added file 'test/rbkt/Queries/zorba/xqddf/error_03.spec'
--- test/rbkt/Queries/zorba/xqddf/error_03.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_03.spec	2012-10-09 15:01:23 +0000
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZDST0027

=== added file 'test/rbkt/Queries/zorba/xqddf/error_03.xq'
--- test/rbkt/Queries/zorba/xqddf/error_03.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_03.xq	2012-10-09 15:01:23 +0000
@@ -0,0 +1,6 @@
+import module namespace error = "http://www.example.com/error" at "error_03.xqlib";
+
+declare namespace ddl = "http://www.zorba-xquery.com/modules/store/static/collections/ddl";
+
+
+ddl:create($error:collection);

=== added file 'test/rbkt/Queries/zorba/xqddf/error_03.xqlib'
--- test/rbkt/Queries/zorba/xqddf/error_03.xqlib	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/xqddf/error_03.xqlib	2012-10-09 15:01:23 +0000
@@ -0,0 +1,16 @@
+module namespace error = "http://www.example.com/error";
+
+declare namespace an = "http://www.zorba-xquery.com/annotations";
+
+
+import module namespace dml = "http://www.zorba-xquery.com/modules/store/static/collections/dml";
+
+
+declare collection error:collection as node()*;
+
+declare variable $error:coll := xs:QName("error:collection");
+
+
+declare %an:automatic %an:value-equality index error:index
+on nodes dml:collection(xs:QName("error:collection"))
+by @id as xs:untypedAtomic;