Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/jdbc_connect-scripting-bug into lp:zorba/jdbc-module.
Commit message:
fix "[SQL08003] There is no connection to any valid source" bug that occurrs
when
not binding a connection to a scripting variable.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jdbc_connect-scripting-bug/+merge/205686
--
https://code.launchpad.net/~zorba-coders/zorba/jdbc_connect-scripting-bug/+merge/205686
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.
=== modified file 'include/jdbc.h'
--- include/jdbc.h 2013-06-11 20:47:52 +
+++ include/jdbc.h 2014-02-11 03:58:32 +
@@ -22,7 +22,7 @@
#include "JavaVMSingleton.h"
#include "sqltypes.h"
-#define JDBC_MODULE_NAMESPACE "http://www.zorba-xquery.com/modules/jdbc";
+#define JDBC_MODULE_NAMESPACE "http://zorba.io/modules/jdbc";
#define INSTANCE_MAP_CONNECTIONS "JdbcInstanceMapConnections"
#define INSTANCE_MAP_STATEMENTS "JdbcInstanceMapStatements"
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2012-11-23 00:45:06 +
+++ src/CMakeLists.txt 2014-02-11 03:58:32 +
@@ -27,7 +27,7 @@
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
DECLARE_ZORBA_MODULE (
- URI "http://www.zorba-xquery.com/modules/jdbc";
+ URI "http://zorba.io/modules/jdbc";
VERSION 1.0
FILE "jdbc.xq"
LINK_LIBRARIES "${JAVA_JVM_LIBRARY}" ${zorba_util-jvm_module_LIBRARIES})
=== modified file 'src/jdbc.xq'
--- src/jdbc.xq 2013-08-09 09:37:05 +
+++ src/jdbc.xq 2014-02-11 03:58:32 +
@@ -1,7 +1,7 @@
-xquery version "3.0";
+jsoniq version "1.0";
(:
- : Copyright 2006-2012 The FLWOR Foundation.
+ : Copyright 2006-2013 The FLWOR Foundation.
:
: Licensed under the Apache License, Version 2.0 (the "License");
: you may not use this file except in compliance with the License.
@@ -17,14 +17,19 @@
:)
(:~
- : This module contains functions to connect to any JDBC datasource
- : using jvm-util module to handle Java interaction.
+ : This module provides functions to communicate to JDBC datasources.
+ : For example, it provides functions to execute queries or updates
+ : using SQL.
+ :
+ : Results of queries are returned as sequences of JSON objects,
+ : one object per row. Basic SQL types are mapped to JSONiq types.
+ : All other types are mapped to string or base64Binary.
:
: @author Rodolfo Ochoa
: @project DB Drivers/JDBC
:)
-module namespace jdbc = "http://www.zorba-xquery.com/modules/jdbc";;
+module namespace jdbc = "http://zorba.io/modules/jdbc";;
declare namespace err = "http://www.w3.org/2005/xqt-errors";;
declare namespace ver = "http://zorba.io/options/versioning";;
@@ -32,38 +37,61 @@
declare option ver:module-version "1.0";
(:~
- : This variable represents the NOT-SUPPORTED level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the NOT-SUPPORTED level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:NOT-SUPPORTED:= "NOT-SUPPORTED";
+
(:~
- : This variable represents the READ-COMMITTED level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the READ-COMMITTED level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:READ-COMMITTED := "READ-COMMITTED";
+
(:~
- : This variable represents the READ-UNCOMMITTED level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the READ-UNCOMMITTED level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:READ-UNCOMMITTED := "READ-UNCOMMITTED";
+
(:~
- : This variable represents the REPEATABLE-READ level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the REPEATABLE-READ level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:REPEATABLE-READ := "REPEATABLE-READ";
+
(:~
- : This variable represents the SERIALIZABLE level for Isolation Levels in $options for 2.2 connect function.
+ : This variable represents the SERIALIZABLE level for Isolation Levels
+ : that can be passed as $options parameter to the connect function.
:)
declare variable $jdbc:SERIALIZABLE := "SERIALIZABLE";
-(:
- : 2 CONNECTION HANDLING
- :)
-
(:~
- : Opens a connection to a database.
- : Returns a URI identifying the connection that has been opened. The implementing code determines from the $connection-config either explicitly (interpreting the driver attribute) or implicitly (using the type attribute) which driver it has to load.
- :
- : @param $connection-config json object that has the host and user informations.
- : @option "url" URL of the server, this option must be specified and should be declared according to JDBC specific
