[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1189784
into lp:zorba/sqlite-module.
Requested reviews:
Luis Rodriguez Gonzalez (kuraru)
Chris Hillery (ceejatec)
Related bugs:
Bug #1189784 in Zorba: Update non-core module sqlite
https://bugs.launchpad.net/zorba/+bug/1189784
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489
Your team Zorba Coders is subscribed to branch lp:zorba/sqlite-module.
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2013-01-24 06:17:00 +
+++ src/CMakeLists.txt 2013-07-29 22:35:31 +
@@ -17,7 +17,7 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
DECLARE_ZORBA_MODULE (
- URI http://www.zorba-xquery.com/modules/sqlite;
+ URI http://zorba.io/modules/sqlite;
VERSION 1.0
FILE sqlite_module.xq
LINK_LIBRARIES ${SQLITE_LIBRARIES})
=== modified file 'src/sqlite_module.xq'
--- src/sqlite_module.xq 2013-06-15 19:48:35 +
+++ src/sqlite_module.xq 2013-07-29 22:35:31 +
@@ -1,4 +1,4 @@
-xquery version 3.0;
+jsoniq version 1.0;
(:
: Copyright 2012 The FLWOR Foundation.
@@ -17,15 +17,15 @@
:)
(:~
- : pThis module provides functionality to extract, add and modify data
- : from SQLite databases./p
+ : This module provides functionality to extract, add and modify data
+ : from SQLite databases.p/
:
: @author Luis Rodgriguez
: @library a href=http://www.sqlite.org/;SQLite/a
: @project DB Drivers/SQLite
:)
-module namespace s = http://www.zorba-xquery.com/modules/sqlite;;
+module namespace s = http://zorba.io/modules/sqlite;;
declare namespace an = http://www.zorba-xquery.com/annotations;;
declare namespace ver = http://www.zorba-xquery.com/options/versioning;;
declare option ver:module-version 1.0;
@@ -37,21 +37,23 @@
:
: @return the SQLite database object as xs:anyURI.
:
- : @error s:SQLI0001 if the database name doesn't exist or it couldn't be opened.
- : @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.
+ : @error s:CANT-OPEN-DB if the database name doesn't exist or it couldn't be
+ : opened.
+ : @error s:COMPILED-WITHOUT-DISK-ACCESS if a non-in-memory database is
+ : requested and the module is built without filesystem access.
+ : @error s:INTERNAL-SQLITE-PROBLEM if there was an internal error inside
+ : SQLite library.
:)
declare %an:sequential function s:connect(
$db-name as xs:string
) as xs:anyURI external;
(:~
- : Connect to a SQLite database with optional options.
+ : Connect to a SQLite database with optional options.p/
: All options are true/false values. Available options are: open-read-only,
: open-create, open-no-mutex, and open-shared-cache.
:
- : pThe options are of the form:
+ : The options are of the form:
: pre
: {
: open_read_only : true,
@@ -59,18 +61,20 @@
: ...
: }
: /pre
- : /p
+ : p/
:
: @param $db-name the SQLite database name to be opened as xs:string.
: @param $options a JSON object containing SQLite connection options.
:
: @return the SQLite database object as xs:anyURI.
:
- : @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.
+ : @error s:CANT-OPEN-DB if the database name doesn't exist or it couldn't be
+ : opened.
+ : @error s:UNKNOWN-OPTION if there is any unknown option specified.
+ : @error s:COMPILED-WITHOUT-DISK-ACCESS if a non-in-memory database is
+ : requested and the module is built without filesystem access.
+ : @error s:INTERNAL-SQLITE-PROBLEM if there was an internal error inside SQLite
+ : library.
:)
declare %an:sequential function s:connect(
$db-name as xs:string,
@@ -82,36 +86,40 @@
:
: @param $conn the SQLite database object as xs:anyURI.
:
- : @return true if the given SQLite database object is connected, false otherwise.
+ : @return true if the given SQLite database object is connected, false
+ : otherwise.
:
- : @error s:SQLI0002 if $conn is not a valid SQLite database object.
- : @error s:SQLI if there was an internal error inside SQLite library.
+ : @error s:INVALID-SQLITE-OBJECT if $conn is not a valid SQLite database object.
+ : @error s:INTERNAL-SQLITE-PROBLEM if there was an internal error inside SQLite
+ : library.
:)
declare %an:sequential function s:is-connected(
$conn as xs:anyURI ) as xs:boolean external;
(:~
- : Commits all the pending update operations in this SQLite database.
+ : Commits all pending update operations in this SQLite database.
:
: @param $conn the
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Review: Approve Looks good - nice job! I made three small changes: 1. Moved a p/ in the metadata() doc to immediately after the leading sentence of the comment. 2. Moved SqliteModule() constructor definition out-of-line. 3. Per mailing list discussion, marked a number of module functions as nondeterministic rather than sequential (per Matthias). -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 :
Votes: {'Approve': 1, 'Pending': 1, 'Needs commit message': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489
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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 Stage CommitZorba failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/67/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
The proposal to merge lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module has been updated. Commit Message changed to: JSONiqfication for Sqlite Module Done! For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
The proposal to merge lp:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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:~zorba-coders/zorba/bug-1189784 into lp:zorba/sqlite-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1189784/+merge/177489 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
