[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-13 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/bug-867253 into lp:zorba has been 
updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-13 Thread Zorba Build Bot 
Validation queue job bug-867253-2012-04-14T05-36-59.424Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-13 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-867253-2012-04-14T05-36-59.424Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-13 Thread Matthias Brantner 
The proposal to merge lp:~zorba-coders/zorba/bug-867253 into lp:zorba has been 
updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-13 Thread Matthias Brantner 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-13 Thread David Graf 
Review: Approve

Reviewed the code and tests an example. Looks good!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-12 Thread Zorba Build Bot 
The proposal to merge lp:~zorba-coders/zorba/bug-867253 into lp:zorba has been 
updated.

Status: Approved => Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-12 Thread Zorba Build Bot 
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, 
Needs Fixing < 1, Pending < 1. Got: 2 Pending.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-12 Thread Zorba Build Bot 
Validation queue job bug-867253-2012-04-12T07-56-58.111Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-12 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-867253-2012-04-12T07-56-58.111Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-12 Thread Matthias Brantner 
The proposal to merge lp:~zorba-coders/zorba/bug-867253 into lp:zorba has been 
updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.

-- 
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

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-867253 into lp:zorba

2012-04-12 Thread Matthias Brantner 
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-867253 into 
lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  David Graf (davidagraf)
Related bugs:
  Bug #867253 in Zorba: "cdml:delete-nodes should only remove root nodes"
  https://bugs.launchpad.net/zorba/+bug/867253

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693

fix for bug #867253 (cdml:delete-nodes should only remove root nodes)
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-867253/+merge/101693
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-04-10 15:41:57 +
+++ ChangeLog	2012-04-12 07:56:20 +
@@ -13,6 +13,7 @@
   * Fixed bug #967864 (var substitution did not update theFreeVars property)
   * Fixed bug in window iterator (binding the end vars in the output tuple stream)
   * Fixed bug #866547 (protect index-join rule from general flwor)
+  * Fixed bug #867253 (cdml:delete-nodes should only remove root nodes)
   * Fixed bug #967428 (do not hoist index creation outside a try-catch)
   * Fixed performance problem with the findNodeSources function of the no-copy rule
   * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2012-03-28 05:19:57 +
+++ include/zorba/pregenerated/diagnostic_list.h	2012-04-12 07:56:20 +
@@ -606,16 +606,18 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0030_INDEX_RANGE_GENERAL_PROBE_NOT_ALLOWED;
 
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0034_INDEX_RANGE_VALUE_PROBE_BAD_KEY_TYPES;
-
-extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0035_INDEX_GENERAL_INSERT;
-
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0031_IC_NOT_DECLARED;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0032_IC_NOT_ACTIVATED;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0033_IC_NOT_MET;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0034_INDEX_RANGE_VALUE_PROBE_BAD_KEY_TYPES;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0035_INDEX_GENERAL_INSERT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDDY0036_NON_ROOT_NODE_DELETION;
+
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDST0001_COLLECTION_ALREADY_DECLARED;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZDST0002_COLLECTION_ALREADY_IMPORTED;

=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-03-28 05:19:57 +
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-04-12 07:56:20 +
@@ -513,14 +513,6 @@
 
 (:~
 :)
-declare variable $zerr:ZDDY0034 as xs:QName := fn:QName($zerr:NS, "zerr:ZDDY0034");
-
-(:~
-:)
-declare variable $zerr:ZDDY0035 as xs:QName := fn:QName($zerr:NS, "zerr:ZDDY0035");
-
-(:~
-:)
 declare variable $zerr:ZDDY0031 as xs:QName := fn:QName($zerr:NS, "zerr:ZDDY0031");
 
 (:~
@@ -533,6 +525,18 @@
 
 (:~
 :)
+declare variable $zerr:ZDDY0034 as xs:QName := fn:QName($zerr:NS, "zerr:ZDDY0034");
+
+(:~
+:)
+declare variable $zerr:ZDDY0035 as xs:QName := fn:QName($zerr:NS, "zerr:ZDDY0035");
+
+(:~
+:)
+declare variable $zerr:ZDDY0036 as xs:QName := fn:QName($zerr:NS, "zerr:ZDDY0036");
+
+(:~
+:)
 declare variable $zerr:ZDST0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZDST0001");
 
 (:~

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2012-03-28 05:19:57 +
+++ src/diagnostics/diagnostic_en.xml	2012-04-12 07:56:20 +
@@ -2069,14 +2069,6 @@
   "$1": index range-general probe not allowed
 
 
-
-  "$1": index range-value probe has search keys with incompatible types
-
-
-
-  "$1": index inserting more than one key not allowed for general index
-
-
 
   "$1": integrity constraint is not declared
 
@@ -2089,6 +2081,17 @@
   "$1": integrity constraint not met for collection "$2"
 
 
+
+  "$1": index range-value probe has search keys with incompatible types
+
+
+
+  "$1": index inserting more than one key not allowed for general index
+
+
+
+  attempt to delete non-root node from collection "$1"
+
 
 
   "$1": collection already declared

=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp	2012-03-28 05:19:57 +
+++ src/diagnostics/pregenerated/diagnostic_list.cpp	2012-04-12 07:56:20 +
@@ -888,12 +888,6 @@
 ZorbaErrorCode ZDDY0030_INDEX_RANGE_GENERAL_PROBE_NOT_ALLOWED( "ZDDY0030" );
 
 
-ZorbaErrorCode ZDDY0034_INDEX_RANGE_VALUE_PROBE_BAD_KEY_TYPES( "ZDDY0034" );
-
-
-ZorbaErrorCode ZDDY0035_INDEX_GENERAL_INSERT( "ZDDY0035" );
-
-
 ZorbaErrorCode ZDDY0031_IC_NOT_DECLARED( "ZDDY0031" );
 
 
@@ -903,6 +897,15 @@
 ZorbaErrorCode ZDDY0033_IC_NOT_MET( "ZDDY0033" );
 
 
+ZorbaErrorCode ZDDY0034_INDEX_RANGE_VALUE_PROBE_BAD_KEY_TYPES( "ZDDY0034" );
+
+
+ZorbaErrorCode ZDDY0035_INDEX_GEN