Zorba

Merge lp:~zorba-coders/zorba/bug-1189862-queue into lp:zorba/queue-module

  1. bug-1189862-queue
  2. Merge into queue-module
Proposed by Paul J. Lucas
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~zorba-coders/zorba/bug-1189862-queue
Merge into: lp:zorba/queue-module
Diff against target: 49 lines (+7/-7)
3 files modified
src/queue.xq (+2/-2)
test/Queries/empty-json1.xq (+2/-2)
test/Queries/empty1.xq (+3/-3)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-1189862-queue
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+190414@code.launchpad.net

Commit message

New store module URI.

Description of the change

New store module URI.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Paul J. Lucas (paul-lucas) wrote :

Matthias: Please review & approve, but make no attempt to merge this since it has to be merged as part of the trunk MP.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/queue.xq'
2--- src/queue.xq 2013-08-09 09:37:05 +0000
3+++ src/queue.xq 2013-10-10 16:22:22 +0000
4@@ -27,8 +27,8 @@
5 :)
6 module namespace queue = "http://zorba.io/modules/queue";
7
8-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
9-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
10+import module namespace collections-ddl = "http://zorba.io/modules/store/dynamic/collections/ddl";
11+import module namespace collections-dml = "http://zorba.io/modules/store/dynamic/collections/dml";
12
13 declare namespace ann = "http://zorba.io/annotations";
14 declare namespace ver = "http://zorba.io/options/versioning";
15
16=== modified file 'test/Queries/empty-json1.xq'
17--- test/Queries/empty-json1.xq 2013-07-05 21:55:02 +0000
18+++ test/Queries/empty-json1.xq 2013-10-10 16:22:22 +0000
19@@ -1,6 +1,6 @@
20 import module namespace queue = "http://zorba.io/modules/queue";
21-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
22-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
23+import module namespace collections-ddl = "http://zorba.io/modules/store/dynamic/collections/ddl";
24+import module namespace collections-dml = "http://zorba.io/modules/store/dynamic/collections/dml";
25
26 variable $name := fn:QName("", "queue1");
27
28
29=== modified file 'test/Queries/empty1.xq'
30--- test/Queries/empty1.xq 2013-06-21 23:10:15 +0000
31+++ test/Queries/empty1.xq 2013-10-10 16:22:22 +0000
32@@ -1,6 +1,6 @@
33 import module namespace queue = "http://zorba.io/modules/queue";
34-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
35-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
36+import module namespace collections-ddl = "http://zorba.io/modules/store/dynamic/collections/ddl";
37+import module namespace collections-dml = "http://zorba.io/modules/store/dynamic/collections/dml";
38
39 variable $name := fn:QName("", "queue1");
40
41@@ -13,7 +13,7 @@
42 queue:pop($name),
43 queue:empty($name),
44 {
45- collections-dml:delete-nodes-first($name, queue:size($name));
46+ collections-dml:delete-first($name, queue:size($name));
47 collections-ddl:delete($name);
48 ()
49 }

Subscribers

People subscribed via source and target branches

to all changes: