Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/unordered-collection-tests into lp:zorba.
Requested reviews: Till Westmann (tillw) Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/unordered-collection-tests/+merge/101374 Fixed tests involving unordered collections, though assuming order for test results. -- https://code.launchpad.net/~zorba-coders/zorba/unordered-collection-tests/+merge/101374 Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/rbkt/ExpQueryResults/zorba/xqddf/daniel/ric6.xml.res' --- test/rbkt/ExpQueryResults/zorba/xqddf/daniel/ric6.xml.res 2012-03-28 05:19:57 +0000 +++ test/rbkt/ExpQueryResults/zorba/xqddf/daniel/ric6.xml.res 2012-04-10 13:15:27 +0000 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <newline/><name>duteous nine eighteen </name><name>great </name><name>scarce brook </name><name>abhorr execution beckon rue </name><name>lived unsur </name><name>wine prevention </name><name>waters derive </name><name>subornation precepts laboured gentleman </name><name>secure desires </name><name>choughs stains </name><name>shall ingenious </name><name>heart </name><name>lessens promise </name><name>nearer conquerors over pays </name><name>abominable confession greet heaven </name><name>mole bonfires </name><name>compact paper </name><name>sake </name><name>strive octavius seals happiness </name><name>gaze wages proving english </name><name>practice space commune women </name><name>holds perhaps despair amorous </name><newline> a </newline><name>duteous nine eighteen </name><name>great </name><name>scarce brook </name><name>abhorr execution beckon rue </name><name>lived unsur </name><name>wine prevention </name><name>waters derive </name><name>subornation precepts laboured gentleman </name><name>secure desires </name><name>choughs stains </name><name>shall ingenious </name><name>heart </name><name>lessens promise </name><name>nearer conquerors over pays </name><name>abominable confession greet heaven </name><name>mole bonfires </name><name>compact paper </name><name>sake </name><name>strive octavius seals happiness </name><name>gaze wages proving english </name><name>practice space commune women </name><name>holds perhaps despair amorous </name><newline> a -</newline><name>duteous nine eighteen </name><name>great </name><name>scarce brook </name><name>abhorr execution beckon rue </name><name>lived unsur </name><name>wine prevention </name><name>waters derive </name><name>subornation precepts laboured gentleman </name><name>secure desires </name><name>choughs stains </name><name>shall ingenious </name><name>heart </name><name>lessens promise </name><name>nearer conquerors over pays </name><name>abominable confession greet heaven </name><name>mole bonfires </name><name>compact paper </name><name>sake </name><name>strive octavius seals happiness </name><name>gaze wages proving english </name><name>practice space commune women </name><name>holds perhaps despair amorous </name><newline> a -</newline><name>great </name><name>scarce brook </name><name>abhorr execution beckon rue </name><name>lived unsur </name><name>wine prevention </name><name>waters derive </name><name>subornation precepts laboured gentleman </name><name>secure desires </name><name>choughs stains </name><name>shall ingenious </name><name>heart </name><name>lessens promise </name><name>nearer conquerors over pays </name><name>abominable confession greet heaven </name><name>mole bonfires </name><name>compact paper </name><name>sake </name><name>strive octavius seals happiness </name><name>gaze wages proving english </name><name>practice space commune women </name><name>holds perhaps despair amorous </name><name>duteous nine eighteen </name> \ No newline at end of file +</newline><name>duteous nine eighteen </name><name>great </name><name>shall ingenious </name><name>heart </name><name>lessens promise </name><name>nearer conquerors over pays </name><name>abominable confession greet heaven </name><name>mole bonfires </name><name>compact paper </name><name>sake </name><name>strive octavius seals happiness </name><name>gaze wages proving english </name><name>scarce brook </name><name>practice space commune women </name><name>holds perhaps despair amorous </name><name>abhorr execution beckon rue </name><name>lived unsur </name><name>wine prevention </name><name>waters derive </name><name>subornation precepts laboured gentleman </name><name>secure desires </name><name>choughs stains </name><newline> a +</newline><name>duteous nine eighteen </name><name>great </name><name>shall ingenious </name><name>heart </name><name>lessens promise </name><name>nearer conquerors over pays </name><name>abominable confession greet heaven </name><name>mole bonfires </name><name>compact paper </name><name>sake </name><name>strive octavius seals happiness </name><name>gaze wages proving english </name><name>scarce brook </name><name>practice space commune women </name><name>holds perhaps despair amorous </name><name>abhorr execution beckon rue </name><name>lived unsur </name><name>wine prevention </name><name>waters derive </name><name>subornation precepts laboured gentleman </name><name>secure desires </name><name>choughs stains </name> \ No newline at end of file === modified file 'test/rbkt/ExpQueryResults/zorba/xqddf/ic-foreignKey.xml.res' --- test/rbkt/ExpQueryResults/zorba/xqddf/ic-foreignKey.xml.res 2012-03-28 05:19:57 +0000 +++ test/rbkt/ExpQueryResults/zorba/xqddf/ic-foreignKey.xml.res 2012-04-10 13:15:27 +0000 @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="UTF-8"?> -<emps>1 2 3</emps><sales>1 2 1</sales>true \ No newline at end of file +<emps>1 2 3</emps><sales>1 1 2</sales>true === modified file 'test/rbkt/Queries/zorba/collections/modifier_3.xq' --- test/rbkt/Queries/zorba/collections/modifier_3.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/collections/modifier_3.xq 2012-04-10 13:15:27 +0000 @@ -48,7 +48,7 @@ declare %ann:sequential function local:test4() { try { { - let $x as element() := dml:collection($ns:coll_1)[1] + let $x as element() := dml:collection($ns:coll_1)[name() eq "a"] return replace node $x/x with <y/>; } === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/i1.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/i1.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/i1.xq 2012-04-10 13:15:27 +0000 @@ -14,4 +14,4 @@ index_ddl:create($xqddf-test:index1); (:xqddf:collection($xqddf-test:white-collection);:) -index_dml:probe-index-point-value($xqddf-test:index1, "United States")[1] +index_dml:probe-index-point-value($xqddf-test:index1, "United States")[@id="item0"] === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/i2.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/i2.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/i2.xq 2012-04-10 13:15:27 +0000 @@ -17,4 +17,4 @@ (:xqddf:collection($xqddf-test:white-collection);:) -index_dml:probe-index-point-value($xqddf-test:index1, "United States")[1] +index_dml:probe-index-point-value($xqddf-test:index1, "United States")[@id="item0"] === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/i3.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/i3.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/i3.xq 2012-04-10 13:15:27 +0000 @@ -17,4 +17,4 @@ index_dml:refresh-index($xqddf-test:index2); (:xqddf:collection($xqddf-test:white-collection);:) -index_dml:probe-index-point-value($xqddf-test:index2, 2)[1] +index_dml:probe-index-point-value($xqddf-test:index2, 2)[@id="item2"] === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/i4.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/i4.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/i4.xq 2012-04-10 13:15:27 +0000 @@ -18,4 +18,4 @@ (:xqddf:collection($xqddf-test:white-collection);:) index_dml:probe-index-range-value($xqddf-test:index2, - 1, 3, fn:true(), fn:true(), fn:true(), fn:false())[1] + 1, 3, fn:true(), fn:true(), fn:true(), fn:false())[@id="item2"] === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/i5.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/i5.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/i5.xq 2012-04-10 13:15:27 +0000 @@ -19,10 +19,10 @@ (:xqddf:collection($xqddf-test:white-collection);:) { -index_dml:probe-index-point-value($xqddf-test:index1, "United States")[1] +index_dml:probe-index-point-value($xqddf-test:index1, "United States")[@id="item0"] }, { index_dml:probe-index-range-value($xqddf-test:index2, - 1, 3, fn:true(), fn:true(), fn:true(), fn:false())[1] + 1, 3, fn:true(), fn:true(), fn:true(), fn:false())[@id="item2"] } === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/i6.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/i6.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/i6.xq 2012-04-10 13:15:27 +0000 @@ -23,14 +23,14 @@ }, { -index_dml:probe-index-point-value($xqddf-test:index1, "United States")[1]/name +index_dml:probe-index-point-value($xqddf-test:index1, "United States")[@id="item0"]/name }, { -index_dml:probe-index-range-value($xqddf-test:index2, 1, 3, fn:true(), fn:true(), fn:true(), fn:false())[1] +index_dml:probe-index-range-value($xqddf-test:index2, 1, 3, fn:true(), fn:true(), fn:true(), fn:false())[@id="item2"] }, { -rename node dml:collection($xqddf-test:white-collection)[1]/location as "location2"; +rename node dml:collection($xqddf-test:white-collection)[@id="item0"]/location as "location2"; }, { <newline> a @@ -38,5 +38,5 @@ }, { -index_dml:probe-index-point-value($xqddf-test:index1, "United States")[1]/name +index_dml:probe-index-point-value($xqddf-test:index1, "United States")[@id="item1"]/name } === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/ric6.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/ric6.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/ric6.xq 2012-04-10 13:15:27 +0000 @@ -30,8 +30,8 @@ }, { try{ - (dml:insert-nodes($xqddf-test:blue-collection, (fn:doc("auction.xml")//item)[1]), - dml:delete-nodes(dml:collection($xqddf-test:blue-collection)[1])); + (dml:insert-nodes($xqddf-test:blue-collection, (fn:doc("auction.xml")//item)[@id="item0"]), + dml:delete-nodes(dml:collection($xqddf-test:blue-collection)[@id="item0"])); } catch * { " cannot delete first item in blue collection"; @@ -42,12 +42,16 @@ </newline> }, { -dml:collection($xqddf-test:white-collection)/name +for $x in dml:collection($xqddf-test:white-collection) +order by $x/@id +return $x/name }, { <newline> a </newline> }, { -dml:collection($xqddf-test:blue-collection)/name +for $x in dml:collection($xqddf-test:blue-collection) +order by $x/@id +return $x/name } === modified file 'test/rbkt/Queries/zorba/xqddf/daniel/undo1.xq' --- test/rbkt/Queries/zorba/xqddf/daniel/undo1.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/daniel/undo1.xq 2012-04-10 13:15:27 +0000 @@ -33,7 +33,7 @@ { { dml:insert-nodes($xqddf-test:blue-collection, <newnode/>); - dml:delete-nodes(dml:collection($xqddf-test:blue-collection)[1]); + dml:delete-nodes(dml:collection($xqddf-test:blue-collection)[@id="item0"]); () } } @@ -46,12 +46,16 @@ </newline> }, { -dml:collection($xqddf-test:white-collection)/name +for $x in dml:collection($xqddf-test:white-collection) +order by number(substring-after($x/@id, "item")) +return $x/name }, { <newline> a </newline> }, { -dml:collection($xqddf-test:blue-collection)/name +for $x in dml:collection($xqddf-test:blue-collection) +order by number(substring-after($x/@id, "item")) +return $x/name } === modified file 'test/rbkt/Queries/zorba/xqddf/ic-foreignKey.xq' --- test/rbkt/Queries/zorba/xqddf/ic-foreignKey.xq 2012-03-28 05:19:57 +0000 +++ test/rbkt/Queries/zorba/xqddf/ic-foreignKey.xq 2012-04-10 13:15:27 +0000 @@ -54,9 +54,17 @@ ); -<emps>{ fn:data(dml:collection($m:empc)/id ) }</emps> +<emps>{ + for $n in dml:collection($m:empc) + order by $n/id + return fn:data($n/id) +}</emps> , -<sales>{ fn:data(dml:collection($m:trnc)/empid ) }</sales> +<sales>{ + for $n in dml:collection($m:trnc) + order by $n/empid + return fn:data($n/empid) +}</sales> , every $x in dml:collection($m:trnc) satisfies
-- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp