zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
fots driver fix: wrap external variable values in ()

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029

fots driver fix: wrap external variable values in ()
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/161029
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt	2013-04-25 21:13:54 +0000
+++ test/fots/CMakeLists.txt	2013-04-25 21:45:33 +0000
@@ -134,6 +134,7 @@
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy20 21619)
 EXPECTED_FOTS_FAILURE (DISPUTED prod-OrderByClause orderBy21 21619)
 EXPECTED_FOTS_FAILURE (DISPUTED misc-CombinedErrorCodes XQST0085 21730)
+EXPECTED_FOTS_FAILURE (DISPUTED prod-VarDefaultValue extvardef-006b 21832)
 
 # Next three possibly unique to old RQ machine, but they need to be
 # marked for the RQ to pass.
@@ -412,7 +413,6 @@
 EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWithout-18 0)
 EXPECTED_FOTS_FAILURE (prod-VarDecl.external K2-ExternalVariablesWith-22 0)
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-003a 0)
-EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-006b 0)
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016a 0)
 EXPECTED_FOTS_FAILURE (prod-VarDefaultValue extvardef-016b 0)
 EXPECTED_FOTS_FAILURE (prod-VersionDecl VersionDecl-v1-processor-and-v3-query 0)

=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq	2013-04-17 19:11:53 +0000
+++ test/fots_driver/environment.xq	2013-04-25 21:45:33 +0000
@@ -490,7 +490,7 @@
                            ends-with($select, "'") and
                            exists($file))
                        then  concat('"', resolve-uri($file, $envBaseURI), '"')
-                       else $select
+                       else concat("(", $select, ")")
       let $varName := $param/@name
       where (exists($select) and exists($param[@declared eq "true"]))
       return