Fixed #251: suppressing of collation for non-string indexes

marklogic-community · Aug 28, 2014 · 02cc59f · 02cc59f
1 parent 35a90d6
commit 02cc59f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/deploy/lib/xquery/setup.xqy b/deploy/lib/xquery/setup.xqy
@@ -1432,7 +1432,7 @@ declare function setup:add-range-element-indexes-R(
               $index-configs[1]/db:scalar-type,
               $index-configs[1]/db:namespace-uri,
               $index-configs[1]/db:localname/fn:string(.),
-              $index-configs[1]/db:collation,
+              fn:string($index-configs[1]/db:collation[../db:scalar-type = 'string']),
               ($index-configs[1]/db:range-value-positions/xs:boolean(.), false())[1],
               ($index-configs[1]/db:invalid-values, "reject")[1]
             )
@@ -1442,7 +1442,7 @@ declare function setup:add-range-element-indexes-R(
               $index-configs[1]/db:scalar-type,
               $index-configs[1]/db:namespace-uri,
               $index-configs[1]/db:localname/fn:string(.),
-              $index-configs[1]/db:collation,
+              fn:string($index-configs[1]/db:collation[../db:scalar-type = 'string']),
               ($index-configs[1]/db:range-value-positions/xs:boolean(.), false())[1]
             )
       ),
@@ -1506,7 +1506,7 @@ declare function setup:add-range-element-attribute-indexes-R(
               $index-configs[1]/db:parent-localname/fn:string(.),
               $index-configs[1]/db:namespace-uri,
               $index-configs[1]/db:localname/fn:string(.),
-              $index-configs[1]/db:collation,
+              fn:string($index-configs[1]/db:collation[../db:scalar-type = 'string']),
               ($index-configs[1]/db:range-value-positions/xs:boolean(.), false())[1],
               ($index-configs[1]/db:invalid-values, "reject")[1]
             )
@@ -1518,7 +1518,7 @@ declare function setup:add-range-element-attribute-indexes-R(
               $index-configs[1]/db:parent-localname/fn:string(.),
               $index-configs[1]/db:namespace-uri,
               $index-configs[1]/db:localname/fn:string(.),
-              $index-configs[1]/db:collation,
+              fn:string($index-configs[1]/db:collation[../db:scalar-type = 'string']),
               ($index-configs[1]/db:range-value-positions/xs:boolean(.), false())[1]
             )
       ),
@@ -1738,7 +1738,7 @@ declare function setup:validate-range-path-indexes(
        $database,
        $x/db:scalar-type,
        $x/db:path-expression,
-       $x/db:collation,
+       fn:string($x/db:collation[../db:scalar-type = "string"]),
        $x/db:range-value-positions,
        $x/db:invalid-values)',
       (xs:QName("database"), $database,