Merge lp:~zorba-coders/zorba/xquery-30-upon-ddl-import into lp:zorba

Proposed by Ghislain Fourny on 2012-03-16
Status: Merged
Approved by: Matthias Brantner on 2012-04-19
Approved revision: 10723
Merged at revision: 10779
Proposed branch: lp:~zorba-coders/zorba/xquery-30-upon-ddl-import
Merge into: lp:zorba
Diff against target: 11 lines (+1/-0)
1 file modified
src/api/staticcollectionmanagerimpl.cpp (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/xquery-30-upon-ddl-import
Reviewer Review Type Date Requested Status
Markos Zaharioudakis 2012-03-16 Approve on 2012-04-18
Matthias Brantner 2012-03-16 Approve on 2012-03-16
Review via email: mp+97827@code.launchpad.net

Commit Message

Declaration of XQuery version 3.0 upon DDL module import

Description of the Change

Declaration of XQuery version 3.0 upon DDL module import

To post a comment you must log in.
Zorba Build Bot (zorba-buildbot) wrote :

No approved revision specified.

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job xquery-30-upon-ddl-import-2012-03-16T11-00-11.855Z is finished. The final status was:

All tests succeeded!

Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 3 Pending.

review: Approve
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/xquery-30-upon-ddl-import into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job xquery-30-upon-ddl-import-2012-04-18T14-31-11.662Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job xquery-30-upon-ddl-import-2012-04-19T07-19-56.151Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/api/staticcollectionmanagerimpl.cpp'
2--- src/api/staticcollectionmanagerimpl.cpp 2011-12-21 14:40:33 +0000
3+++ src/api/staticcollectionmanagerimpl.cpp 2012-03-16 10:24:21 +0000
4@@ -104,6 +104,7 @@
5 {
6 Zorba_CompilerHints_t lHints;
7 std::ostringstream lProlog;
8+ lProlog << "xquery version '3.0';";
9 lProlog << "import module namespace d = '" << theColDDLNamespace << "';";
10 lProlog << "import module namespace iddl = '" << theIdxDDLNamespace << "';";
11 aCtx->loadProlog(lProlog.str(), lHints);

Subscribers

People subscribed via source and target branches