Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1095889 into lp:zorba
Review: Needs Information cat tmp.xml ab//a zorba -q 'doc(tmp.xml)' .:1,2: dynamic error [err:FODC0002]: f:2,1: loader parsing error: '' expected; raised at /home/mbrantner/zorba/sandbox/src/store/naive/loader_fast.cpp:157 What should 'f:2,1:' tell me? I assume f means file and 2,1 is a location. If so, line 2 column 1 doesn't make any sense. Neither tmp.xml nor my query does have an error in line 2. What am I missing? -- https://code.launchpad.net/~zorba-coders/zorba/bug-1095889/+merge/143823 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-1095889 into lp:zorba
Review: Needs Information zorba -q 'parse-xml(a)' .:1,2: dynamic error [err:FODC0006]: invalid content passed to fn:parse-xml(): ; raised at /home/mbrantner/zorba/sandbox/src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp:88 The error message seems to be broken. Why is there a '' at the end? -- https://code.launchpad.net/~zorba-coders/zorba/bug-1095889/+merge/143823 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Cleaned-up unit_tests AGAIN (removed duplicate entries).
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033
Cleaned-up unit_tests AGAIN (removed duplicate entries).
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/unit_tests/unit_test_list.h'
--- src/unit_tests/unit_test_list.h 2013-01-24 02:27:45 +
+++ src/unit_tests/unit_test_list.h 2013-01-25 21:40:28 +
@@ -29,22 +29,18 @@
int runDebuggerProtocolTest(int argc, char* argv[]);
int test_base64( int, char*[] );
-
int test_base64_streambuf( int, char*[] );
-
int test_fs_iterator( int, char*[] );
+ int test_hashmaps( int argc, char* argv[] );
#ifndef ZORBA_NO_ICU
int test_icu_streambuf( int, char*[] );
#endif /* ZORBA_NO_ICU */
int test_json_parser( int, char*[] );
-
int test_string( int, char*[] );
int test_time_parse( int, char*[] );
- int test_unique_ptr( int, char*[] );
-
#ifdef ZORBA_WITH_FILE_ACCESS
int test_fs_iterator( int, char*[] );
#endif /* ZORBA_WITH_FILE_ACCESS */
@@ -59,8 +55,6 @@
int test_unique_ptr( int, char*[] );
#endif /* ZORBA_HAVE_UNIQUE_PTR */
- int test_uuid( int, char*[] );
-
#ifndef ZORBA_HAVE_UNORDERED_MAP
int test_unordered_map( int, char*[] );
#endif /* ZORBA_HAVE_UNORDERED_MAP */
@@ -69,7 +63,7 @@
int test_unordered_set( int, char*[] );
#endif /* ZORBA_HAVE_UNORDERED_SET */
- int test_hashmaps(int argc, char* argv[]);
+ int test_uuid( int, char*[] );
void initializeTestList();
=== modified file 'src/unit_tests/unit_tests.cpp'
--- src/unit_tests/unit_tests.cpp 2013-01-24 02:27:45 +
+++ src/unit_tests/unit_tests.cpp 2013-01-25 21:40:28 +
@@ -38,19 +38,19 @@
void initializeTestList()
{
libunittests[base64] = test_base64;
-
libunittests[base64_streambuf] = test_base64_streambuf;
#ifdef ZORBA_WITH_FILE_ACCESS
libunittests[fs_iterator] = test_fs_iterator;
#endif /* ZORBA_WITH_FILE_ACCESS */
+ libunittests[hashmaps] = test_hashmaps;
+
#ifndef ZORBA_NO_ICU
libunittests[icu_streambuf] = test_icu_streambuf;
#endif /* ZORBA_NO_ICU */
libunittests[json_parser] = test_json_parser;
-
libunittests[string] = test_string;
libunittests[time_parse] = test_time_parse;
@@ -74,8 +74,6 @@
libunittests[unordered_set] = test_unordered_set;
#endif /* ZORBA_HAVE_UNORDERED_SET */
- libunittests[hashmaps] = test_hashmaps;
-
libunittests[uri] = runUriTest;
#ifdef ZORBA_WITH_DEBUGGER
--
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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-25T21-45-02.987Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-01-25T21-45-02.987Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145033 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/bug867068-fixErrorXQDY0027 into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba.
Commit message:
Fixes how error XQDY0027 is constructed.
Requested reviews:
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #867068 in Zorba: Incorrect usage of XQDY0027
https://bugs.launchpad.net/zorba/+bug/867068
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036
Fixes how error XQDY0027 is constructed.
--
https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-01-19 20:47:55 +
+++ src/diagnostics/diagnostic_en.xml 2013-01-25 22:22:25 +
@@ -808,6 +808,14 @@
either \c valid or \c notKnown if validation mode is \c lax.
/comment
value$1: unexpected validity property${: 2}/value
+
+ entry key=SerializationElementName_2
+value$2: invalid serialization parameters element name must be serialization parameters/value
+ /entry
+
+ entry key=SerializationElementNs_2
+value$2: invalid namespace for the serialization-parameters element, must be http://www.w3.org/2010/xslt-xquery-serialization;/value
+ /entry
/diagnostic
diagnostic code=XQDY0041
@@ -2401,19 +2409,19 @@
diagnostic code=ZDDY0037 name=COLLECTION_APPEND_BAD_EDIT
value$1: illegal edit in append-only collection/value
/diagnostic
-
+
diagnostic code=ZDDY0038 name=COLLECTION_QUEUE_BAD_EDIT
value$1: illegal edit from queue collection/value
/diagnostic
-
+
diagnostic code=ZDDY0039 name=NON_ROOT_NODE_EDIT
valueattempt to edit non-root node in collection $1/value
/diagnostic
-
+
diagnostic code=ZDDY0040 name=INCONSISTENT_EDIT
valueattempt to edit an item with a template of a different kind (for example an object with a node)./value
/diagnostic
-
+
diagnostic code=ZDST0001 name=COLLECTION_ALREADY_DECLARED
value$1: collection already declared/value
/diagnostic
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-01-19 20:47:55 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-01-25 22:22:25 +
@@ -916,6 +916,8 @@
{ ~XPTY0004_NoTypePromote_23, $2 can not be promoted to type $3 },
{ ~XPTY0117_NodeCast, Cannot cast node to xs:QName },
{ ~XPTY0117_NotationParam_23, $2 can not be promoted to parameter type xs:NOTATION of function $3() },
+ { ~XQDY0027_SerializationElementName_2, \$2\: invalid serialization parameters element name must be \serialization parameters\ },
+ { ~XQDY0027_SerializationElementNs_2, \$2\: invalid namespace for the serialization-parameters element, must be \http://www.w3.org/2010/xslt-xquery-serialization\; },
{ ~XQST0046_BadHexDigit_3, '$3': invalid hexedecimal digit },
{ ~XQST0106_CONFLICTING, conflicting },
{ ~XQST0106_THE_SAME, the same },
=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
--- src/diagnostics/pregenerated/dict_zed_keys.h 2013-01-19 20:47:55 +
+++ src/diagnostics/pregenerated/dict_zed_keys.h 2013-01-25 22:22:25 +
@@ -55,6 +55,8 @@
#define ZED_XPDY0002_VariableHasNoValue_2 ~XPDY0002_VariableHasNoValue_2
#define ZED_XPDY0002_VariableUndeclared_2 ~XPDY0002_VariableUndeclared_2
#define ZED_XPDY0002_ContextUndeclared_2 ~XPDY0002_ContextUndeclared_2
+#define ZED_XQDY0027_SerializationElementName_2 ~XQDY0027_SerializationElementName_2
+#define ZED_XQDY0027_SerializationElementNs_2 ~XQDY0027_SerializationElementNs_2
#define ZED_FTST0009_BadStopWordsLang ~FTST0009_BadStopWordsLang
#define ZED_FTST0009_BadStemmerLang ~FTST0009_BadStemmerLang
#define ZED_FTST0009_BadThesaurusLang ~FTST0009_BadThesaurusLang
=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2012-10-08 12:09:36 +
+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp 2013-01-25 22:22:25 +
@@ -26,6 +26,9 @@
#include runtime/api/plan_iterator_wrapper.h
#include compiler/api/compilercb.h
+#include diagnostics/assert.h
+#include diagnostics/util_macros.h
+
#include store/api/store.h
#include store/api/item.h
#include store/api/item_factory.h
@@ -74,9 +77,9 @@
is = iss.get();
}
-
+
baseUri = theSctx-get_base_uri();
-
+
try {
store::LoadProperties loadProps;
@@ -117,12 +120,10 @@
if (lElemName-getLocalName() != serialization-parameters)
{
ztd::string_builder lSb;
-lSb the serialization parameters element must have the name \serialization parameters\.
- \ lElemName-getLocalName() \ was found;
-throw XQUERY_EXCEPTION(
- err::XQDY0027,
- ERROR_PARAMS(lSb.str()),
- ERROR_LOC( aLoc ));
+lSb
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 -- https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 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/bug867068-fixErrorXQDY0027 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba has been updated. Commit Message changed to: Fixes how error XQDY0027 is constructed. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 -- https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 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/bug867068-fixErrorXQDY0027 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug867068-fixErrorXQDY0027-2013-01-25T22-23-00.553Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
Fixed to_string() for char* type.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037
Fixed to_string() for char* type.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/internal/ztd.h'
--- include/zorba/internal/ztd.h 2012-12-08 00:09:48 +
+++ include/zorba/internal/ztd.h 2013-01-25 22:26:24 +
@@ -260,16 +260,35 @@
/**
* \internal
+ * Tests whether a given type \a T is a C string type.
+ *
+ * @tparam T The type to check.
+ */
+templatetypename T
+class is_c_string {
+ typedef typename ZORBA_TR1_NS::remove_pointerT::type T_base;
+ typedef typename ZORBA_TR1_NS::add_constT_base::type T_base_const;
+public:
+ static bool const value =
+ ZORBA_TR1_NS::is_sameT_base_const*,char const*::value
+|| ZORBA_TR1_NS::is_sameT_base_const*,unsigned char const*::value
+|| ZORBA_TR1_NS::is_sameT_base_const*,signed char const*::value;
+};
+
+/**
+ * \internal
* Converts an object to its string representation.
*
* @tparam T The object type that:
+ * - is not an array
* - is not a pointer
* - has an codeostream operatorlt;lt;(ostream,T const)/code defined
* @param t The object.
* @return Returns a string representation of the object.
*/
templatetypename T inline
-typename std::enable_if!ZORBA_TR1_NS::is_pointerT::value
+typename std::enable_if!ZORBA_TR1_NS::is_arrayT::value
+ !ZORBA_TR1_NS::is_pointerT::value
has_insertion_operatorT::value,
std::string::type
to_string( T const t ) {
@@ -345,7 +364,7 @@
/**
* \internal
- * Specialization of \c to_string() for pointer types.
+ * Specialization of \c to_string() for pointer types other than C strings.
*
* @tparam T The pointer type.
* @param p The pointer.
@@ -353,10 +372,13 @@
* otherwise returns \c null.
*/
templatetypename T inline
-typename std::enable_ifZORBA_TR1_NS::is_pointerT::value,std::string::type
+typename std::enable_ifZORBA_TR1_NS::is_pointerT::value
+ !is_c_stringT::value,
+std::string::type
to_string( T p ) {
- typedef typename ZORBA_TR1_NS::remove_pointerT::type const* T_const_ptr;
- return p ? to_string( *static_castT_const_ptr( p ) ) : null;
+ typedef typename ZORBA_TR1_NS::remove_pointerT::type T_base;
+ typedef typename ZORBA_TR1_NS::add_constT_base::type T_base_const;
+ return p ? to_string( *static_castT_base_const*( p ) ) : null;
}
/**
@@ -370,6 +392,17 @@
return s ? s : null;
}
+/**
+ * \internal
+ * Specialization of \c to_string() for C strings.
+ *
+ * @param s The C string.
+ * @return Returns a string representation of the object.
+ */
+inline std::string to_string( unsigned char const *s ) {
+ return s ? reinterpret_castchar const*( s ) : null;
+}
+
// misc ///
/**
--
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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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/bug867068-fixErrorXQDY0027 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bug867068-fixErrorXQDY0027-2013-01-25T22-23-00.553Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 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/bug867068-fixErrorXQDY0027 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug867068-fixErrorXQDY0027 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 -- https://code.launchpad.net/~zorba-coders/zorba/bug867068-fixErrorXQDY0027/+merge/145036 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-25T22-49-47.678Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job pjl-misc-2013-01-25T22-49-47.678Z 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 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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/sqlite-check-for-metadata-availability into lp:zorba/sqlite-module
Luis Rodriguez Gonzalez has proposed merging
lp:~zorba-coders/zorba/sqlite-check-for-metadata-availability into
lp:zorba/sqlite-module.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1102549 in Zorba: SQLite module doesn't link on MacOS
https://bugs.launchpad.net/zorba/+bug/1102549
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041
- New feature detection code added to CMake to be sure that SQLite is able to
read metadata (fix for Mac OSX)
--
https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041
Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module.
=== modified file 'cmake_modules/FindSQLite3.cmake'
--- cmake_modules/FindSQLite3.cmake 2012-11-20 16:41:36 +
+++ cmake_modules/FindSQLite3.cmake 2013-01-25 23:35:26 +
@@ -39,8 +39,9 @@
SET(CMAKE_REQUIRED_INCLUDES ${SQLITE_INCLUDE_DIR})
SET(CMAKE_REQUIRED_LIBRARIES ${SQLITE_LIBRARY})
-# INCLUDE(CheckFunctionExists)
-# CHECK_FUNCTION_EXISTS(archive_write_zip_set_compression_deflate #ZORBA_LIBARCHIVE_HAVE_SET_COMPRESSION)
+
+ INCLUDE(CheckFunctionExists)
+ CHECK_FUNCTION_EXISTS(sqlite3_column_database_name ZORBA_SQLITE_HAVE_METADATA)
ELSE (SQLITE_INCLUDE_DIR AND SQLITE_LIBRARY)
SET (SQLITE_FOUND 0)
SET (SQLITE_LIBRARIES)
=== modified file 'src/config.h.cmake'
--- src/config.h.cmake 2013-01-24 06:17:00 +
+++ src/config.h.cmake 2013-01-25 23:35:26 +
@@ -21,5 +21,6 @@
#define ZORBA_SQLITE_CONFIG_H
#cmakedefine SQLITE_WITH_FILE_ACCESS
+#cmakedefine ZORBA_SQLITE_HAVE_METADATA
#endif /* ZORBA_SQLITE_CONFIG_H */
=== modified file 'src/sqlite_module.xq'
--- src/sqlite_module.xq 2013-01-24 06:17:00 +
+++ src/sqlite_module.xq 2013-01-25 23:35:26 +
@@ -68,6 +68,8 @@
:
: @error s:SQLI0001 if the databse name doesn't exist or it couldn't be opened.
: @error s:SQLI0007 if there is any unknown option specified.
+ : @error s:SQLI0008 if a non-in-memory database is requested and the module
+ : is built without filesystem access
: @error s:SQLI if there was an internal error inside SQLite library.
:)
declare %an:sequential function s:connect(
@@ -173,6 +175,8 @@
: @return a object() with the associated the metadata.
:
: @error s:SQLI0004 if $pstmnt is not a valid SQLite prepared statement.
+ : @error s:SQLI0009 if no metadata is available (SQLite library compiled without
+ : SQLITE_ENABLE_COLUMN_METADATA).
: @error s:SQLI if there was an internal error inside SQLite library.
:)
declare %an:sequential function s:metadata(
=== modified file 'src/sqlite_module.xq.src/sqlite_module.cpp'
--- src/sqlite_module.xq.src/sqlite_module.cpp 2013-01-24 06:17:00 +
+++ src/sqlite_module.xq.src/sqlite_module.cpp 2013-01-25 23:35:26 +
@@ -573,6 +573,12 @@
return Only in-memory databases are allowed (Module built without filesystem access);
}
#endif /* not SQLITE_WITH_FILE_ACCESS */
+#ifndef ZORBA_SQLITE_HAVE_METADATA
+else if(error == SQLI0009)
+{
+ return Metadata not found (SQLite built without SQLITE_ENABLE_COLUMN_METADATA);
+}
+#endif /* not ZORBA_SQLITE_HAVE_METADATA */
else if(error == SQLI)
{
return Internal error ocurred;
@@ -826,6 +832,7 @@
int lNotNull, lPrimaryKey, lAutoinc, lRc;
if(theRc == SQLITE_ROW){
+#ifdef ZORBA_SQLITE_HAVE_METADATA
// Get the metadata for 'theActualColumn' column
// in a key = value fashion
lDbHandle = sqlite3_db_handle(theStmt);
@@ -867,6 +874,7 @@
aKey = theFactory-createString(autoincrement);
aValue = theFactory-createBoolean((lAutoinc==0)?false:true);
elements.push_back(std::pairzorba::Item, zorba::Item(aKey, aValue));
+#endif
aItem = theFactory-createJSONObject(elements);
elements.clear();
// Get more data if available
@@ -1068,6 +1076,7 @@
const zorba::StaticContext* aSctx,
const zorba::DynamicContext* aDctx) const
{
+#ifdef ZORBA_SQLITE_HAVE_METADATA
sqlite3_stmt *lPstmt;
zorba::Item lItemPstmt = getOneItem(aArgs, 0);
zorba::Item lVecItem, lJSONKey, lJSONArray, lJSONRes;
@@ -1101,6 +1110,9 @@
lJSONRes = lFactory-createJSONObject(lVectorRes);
return ItemSequence_t(new SingletonItemSequence(lJSONRes));
+#else
+throwError(SQLI0008, getErrorMessage(SQLI0008));
+#endif
}
/***
=== added file 'test/Queries/test3.spec'
--- test/Queries/test3.spec 1970-01-01 00:00:00 +
+++ test/Queries/test3.spec 2013-01-25 23:35:26 +
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/modules/sqlite:SQLI0009
=== added file 'test/Queries/test4.spec'
--- test/Queries/test4.spec 1970-01-01 00:00:00 +
+++ test/Queries/test4.spec 2013-01-25 23:35:26 +
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/modules/sqlite:SQLI0009
=== added file
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-utf8_streambuf-2013-01-26T01-04-43.101Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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/sqlite-check-for-metadata-availability into lp:zorba/sqlite-module
Review: Needs Fixing Unless I'm missing something, it'd be cleaner to avoid the compilation of JSONMetadataItemSequence entirely by #ifdef-ing out the class and method definitions in the .cpp and .h files. -- https://code.launchpad.net/~zorba-coders/zorba/sqlite-check-for-metadata-availability/+merge/145041 Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module. -- 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
Validation queue job feature-utf8_streambuf-2013-01-26T01-04-43.101Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/feature-utf8_streambuf into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 -- https://code.launchpad.net/~paul-lucas/zorba/feature-utf8_streambuf/+merge/142440 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-26T01-31-45.923Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job pjl-misc-2013-01-26T01-31-45.923Z 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 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145037 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
