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

Proposed by Ghislain Fourny
Status: Merged
Approved by: Matthias Brantner
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 Approve
Matthias Brantner Approve
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.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

No approved revision specified.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
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!

Revision history for this message
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.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
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
=== modified file 'src/api/staticcollectionmanagerimpl.cpp'
--- src/api/staticcollectionmanagerimpl.cpp 2011-12-21 14:40:33 +0000
+++ src/api/staticcollectionmanagerimpl.cpp 2012-03-16 10:24:21 +0000
@@ -104,6 +104,7 @@
104{104{
105 Zorba_CompilerHints_t lHints;105 Zorba_CompilerHints_t lHints;
106 std::ostringstream lProlog;106 std::ostringstream lProlog;
107 lProlog << "xquery version '3.0';";
107 lProlog << "import module namespace d = '" << theColDDLNamespace << "';";108 lProlog << "import module namespace d = '" << theColDDLNamespace << "';";
108 lProlog << "import module namespace iddl = '" << theIdxDDLNamespace << "';";109 lProlog << "import module namespace iddl = '" << theIdxDDLNamespace << "';";
109 aCtx->loadProlog(lProlog.str(), lHints);110 aCtx->loadProlog(lProlog.str(), lHints);

Subscribers

People subscribed via source and target branches