Zorba

Merge lp:~zorba-coders/zorba/jdbc_connect-scripting-bug into lp:zorba/jdbc-module

  1. jdbc_connect-scripting-bug
  2. Merge into jdbc-module
Proposed by Matthias Brantner
Status: Needs review
Proposed branch: lp:~zorba-coders/zorba/jdbc_connect-scripting-bug
Merge into: lp:zorba/jdbc-module
Diff against target: 455 lines (+55/-47)
24 files modified
src/jdbc.xq.src/connection/connectionoptions.cpp (+2/-1)
src/jdbc.xq.src/connection/isconnected.cpp (+2/-1)
src/jdbc.xq.src/connection/tables.cpp (+2/-2)
src/jdbc.xq.src/datasets/affectedrows.cpp (+2/-2)
src/jdbc.xq.src/datasets/metadata.cpp (+2/-2)
src/jdbc.xq.src/datasets/resultset.cpp (+2/-2)
src/jdbc.xq.src/prepared/clearparams.cpp (+2/-2)
src/jdbc.xq.src/prepared/closeprepared.cpp (+2/-2)
src/jdbc.xq.src/prepared/executeprepared.cpp (+2/-2)
src/jdbc.xq.src/prepared/executequeryprepared.cpp (+2/-2)
src/jdbc.xq.src/prepared/executeupdateprepared.cpp (+2/-2)
src/jdbc.xq.src/prepared/parametermetadata.cpp (+2/-2)
src/jdbc.xq.src/prepared/preparestatement.cpp (+2/-3)
src/jdbc.xq.src/prepared/setboolean.cpp (+2/-2)
src/jdbc.xq.src/prepared/setnull.cpp (+2/-2)
src/jdbc.xq.src/prepared/setnumeric.cpp (+2/-2)
src/jdbc.xq.src/prepared/setstring.cpp (+2/-2)
src/jdbc.xq.src/prepared/setvalue.cpp (+2/-2)
src/jdbc.xq.src/statements/execute.cpp (+3/-2)
src/jdbc.xq.src/statements/executequery.cpp (+3/-2)
src/jdbc.xq.src/statements/executeupdate.cpp (+3/-2)
src/jdbc.xq.src/transactions/commit.cpp (+2/-2)
src/jdbc.xq.src/transactions/rollback.cpp (+2/-2)
test/Queries/02-select.xq (+6/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/jdbc_connect-scripting-bug
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Federico Cavalieri Pending
Review via email: mp+205686@code.launchpad.net

Commit message

  fix "[SQL08003] There is no connection to any valid source" bug that occurrs when
  not binding a connection to a scripting variable.

To post a comment you must log in.
lp:~zorba-coders/zorba/jdbc_connect-scripting-bug updated
60. By Matthias Brantner

fix "[SQL08003] There is no connection to any valid source" bug that occurrs when
  not binding a connection to a scripting variable.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Reply
lp:~zorba-coders/zorba/jdbc_connect-scripting-bug updated
61. By Matthias Brantner

fixed remaining problem regarding connection issue

Unmerged revisions

61. By Matthias Brantner

fixed remaining problem regarding connection issue

60. By Matthias Brantner

fix "[SQL08003] There is no connection to any valid source" bug that occurrs when
  not binding a connection to a scripting variable.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/jdbc.xq.src/connection/connectionoptions.cpp'
2--- src/jdbc.xq.src/connection/connectionoptions.cpp 2013-01-29 21:33:07 +0000
3+++ src/jdbc.xq.src/connection/connectionoptions.cpp 2014-02-11 20:16:14 +0000
4@@ -28,11 +28,12 @@
5 const zorba::StaticContext* aStaticContext,
6 const zorba::DynamicContext* aDynamincContext) const
7 {
8+ String lStrUUID = JdbcModule::getStringArg(args, 0);
9+
10 CHECK_CONNECTION
11 Item result;
12
13 JDBC_MODULE_TRY
14- String lStrUUID = JdbcModule::getStringArg(args, 0);
15
16 jobject oConnection = JdbcModule::getObject(aDynamincContext, lStrUUID, INSTANCE_MAP_CONNECTIONS);
17
18
19=== modified file 'src/jdbc.xq.src/connection/isconnected.cpp'
20--- src/jdbc.xq.src/connection/isconnected.cpp 2012-12-27 22:23:41 +0000
21+++ src/jdbc.xq.src/connection/isconnected.cpp 2014-02-11 20:16:14 +0000
22@@ -28,10 +28,11 @@
23 const zorba::StaticContext* aStaticContext,
24 const zorba::DynamicContext* aDynamincContext) const
25 {
26+ String lConnectionUUID = JdbcModule::getStringArg(args, 0);
27+
28 CHECK_CONNECTION
29 jboolean isClosed = JNI_FALSE;
30 JDBC_MODULE_TRY
31- String lConnectionUUID = JdbcModule::getStringArg(args, 0);
32
33 jobject oConnection = JdbcModule::getObject(aDynamincContext, lConnectionUUID, INSTANCE_MAP_CONNECTIONS);
34
35
36=== modified file 'src/jdbc.xq.src/connection/tables.cpp'
37--- src/jdbc.xq.src/connection/tables.cpp 2013-06-12 14:34:44 +0000
38+++ src/jdbc.xq.src/connection/tables.cpp 2014-02-11 20:16:14 +0000
39@@ -49,13 +49,13 @@
40 const zorba::StaticContext* aStaticContext,
41 const zorba::DynamicContext* aDynamincContext) const
42 {
43+ String lStrUUID = JdbcModule::getStringArg(args, 0);
44+
45 CHECK_CONNECTION
46 jobject result=NULL;
47
48 JDBC_MODULE_TRY
49
50- String lStrUUID = JdbcModule::getStringArg(args, 0);
51-
52 jobject oConnection = JdbcModule::getObject(aDynamincContext, lStrUUID, INSTANCE_MAP_CONNECTIONS);
53
54 jobject oDatabaseMetadata = env->CallObjectMethod(oConnection, jConnection.getMetadata);
55
56=== modified file 'src/jdbc.xq.src/datasets/affectedrows.cpp'
57--- src/jdbc.xq.src/datasets/affectedrows.cpp 2012-12-27 22:13:59 +0000
58+++ src/jdbc.xq.src/datasets/affectedrows.cpp 2014-02-11 20:16:14 +0000
59@@ -28,12 +28,12 @@
60 const zorba::StaticContext* aStaticContext,
61 const zorba::DynamicContext* aDynamincContext) const
62 {
63+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
64+
65 CHECK_CONNECTION
66 Item result;
67
68 JDBC_MODULE_TRY
69- String lStatementUUID = JdbcModule::getStringArg(args, 0);
70-
71 zorba::ItemFactory* itemFactory = Zorba::getInstance(0)->getItemFactory();
72
73 jobject oStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_STATEMENTS);
74
75=== modified file 'src/jdbc.xq.src/datasets/metadata.cpp'
76--- src/jdbc.xq.src/datasets/metadata.cpp 2013-01-05 01:04:21 +0000
77+++ src/jdbc.xq.src/datasets/metadata.cpp 2014-02-11 20:16:14 +0000
78@@ -29,12 +29,12 @@
79 const zorba::StaticContext* aStaticContext,
80 const zorba::DynamicContext* aDynamincContext) const
81 {
82+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
83+
84 CHECK_CONNECTION
85 Item result;
86
87 JDBC_MODULE_TRY
88- String lStatementUUID = JdbcModule::getStringArg(args, 0);
89-
90 jobject oStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_STATEMENTS);
91
92 zorba::ItemFactory* itemFactory = Zorba::getInstance(0)->getItemFactory();
93
94=== modified file 'src/jdbc.xq.src/datasets/resultset.cpp'
95--- src/jdbc.xq.src/datasets/resultset.cpp 2012-12-27 22:23:41 +0000
96+++ src/jdbc.xq.src/datasets/resultset.cpp 2014-02-11 20:16:14 +0000
97@@ -29,12 +29,12 @@
98 const zorba::StaticContext* aStaticContext,
99 const zorba::DynamicContext* aDynamincContext) const
100 {
101+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
102+
103 CHECK_CONNECTION
104 jobject result=NULL;
105
106 JDBC_MODULE_TRY
107- String lStatementUUID = JdbcModule::getStringArg(args, 0);
108-
109 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_STATEMENTS);
110
111 int iUpdateCount = env->CallIntMethod(oPreparedStatement, jPreparedStatement.getUpdateCount);
112
113=== modified file 'src/jdbc.xq.src/prepared/clearparams.cpp'
114--- src/jdbc.xq.src/prepared/clearparams.cpp 2012-12-27 22:13:59 +0000
115+++ src/jdbc.xq.src/prepared/clearparams.cpp 2014-02-11 20:16:14 +0000
116@@ -28,12 +28,12 @@
117 const zorba::StaticContext* aStaticContext,
118 const zorba::DynamicContext* aDynamincContext) const
119 {
120+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
121+
122 CHECK_CONNECTION
123 Item result;
124
125 JDBC_MODULE_TRY
126- String lStatementUUID = JdbcModule::getStringArg(args, 0);
127-
128 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
129
130 env->CallVoidMethod(oPreparedStatement, jPreparedStatement.clearParameters);
131
132=== modified file 'src/jdbc.xq.src/prepared/closeprepared.cpp'
133--- src/jdbc.xq.src/prepared/closeprepared.cpp 2013-01-05 01:04:21 +0000
134+++ src/jdbc.xq.src/prepared/closeprepared.cpp 2014-02-11 20:16:14 +0000
135@@ -29,9 +29,9 @@
136 const zorba::StaticContext* aStaticContext,
137 const zorba::DynamicContext* aDynamincContext) const
138 {
139+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
140+
141 CHECK_CONNECTION
142-
143- String lStatementUUID = JdbcModule::getStringArg(args, 0);
144
145 JdbcModule::deleteObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
146
147
148=== modified file 'src/jdbc.xq.src/prepared/executeprepared.cpp'
149--- src/jdbc.xq.src/prepared/executeprepared.cpp 2012-12-27 22:13:59 +0000
150+++ src/jdbc.xq.src/prepared/executeprepared.cpp 2014-02-11 20:16:14 +0000
151@@ -29,12 +29,12 @@
152 const zorba::StaticContext* aStaticContext,
153 const zorba::DynamicContext* aDynamincContext) const
154 {
155+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
156+
157 CHECK_CONNECTION
158 Item result;
159
160 JDBC_MODULE_TRY
161- String lStatementUUID = JdbcModule::getStringArg(args, 0);
162-
163 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
164
165 env->CallBooleanMethod(oPreparedStatement, jPreparedStatement.execute);
166
167=== modified file 'src/jdbc.xq.src/prepared/executequeryprepared.cpp'
168--- src/jdbc.xq.src/prepared/executequeryprepared.cpp 2012-12-27 22:13:59 +0000
169+++ src/jdbc.xq.src/prepared/executequeryprepared.cpp 2014-02-11 20:16:14 +0000
170@@ -29,12 +29,12 @@
171 const zorba::StaticContext* aStaticContext,
172 const zorba::DynamicContext* aDynamincContext) const
173 {
174+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
175+
176 CHECK_CONNECTION
177 jobject result=NULL;
178
179 JDBC_MODULE_TRY
180- String lStatementUUID = JdbcModule::getStringArg(args, 0);
181-
182 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
183
184 result = env->CallObjectMethod(oPreparedStatement, jPreparedStatement.executeQuery);
185
186=== modified file 'src/jdbc.xq.src/prepared/executeupdateprepared.cpp'
187--- src/jdbc.xq.src/prepared/executeupdateprepared.cpp 2012-12-27 22:13:59 +0000
188+++ src/jdbc.xq.src/prepared/executeupdateprepared.cpp 2014-02-11 20:16:14 +0000
189@@ -29,12 +29,12 @@
190 const zorba::StaticContext* aStaticContext,
191 const zorba::DynamicContext* aDynamincContext) const
192 {
193+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
194+
195 CHECK_CONNECTION
196 Item result;
197
198 JDBC_MODULE_TRY
199- String lStatementUUID = JdbcModule::getStringArg(args, 0);
200-
201 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
202
203 int rowCount = env->CallIntMethod(oPreparedStatement, jPreparedStatement.executeUpdate);
204
205=== modified file 'src/jdbc.xq.src/prepared/parametermetadata.cpp'
206--- src/jdbc.xq.src/prepared/parametermetadata.cpp 2012-12-27 22:54:36 +0000
207+++ src/jdbc.xq.src/prepared/parametermetadata.cpp 2014-02-11 20:16:14 +0000
208@@ -29,12 +29,12 @@
209 const zorba::StaticContext* aStaticContext,
210 const zorba::DynamicContext* aDynamincContext) const
211 {
212+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
213+
214 CHECK_CONNECTION
215 Item result;
216
217 JDBC_MODULE_TRY
218- String lStatementUUID = JdbcModule::getStringArg(args, 0);
219-
220 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
221
222 jobject oParameterMetaData = env->CallObjectMethod(oPreparedStatement, jPreparedStatement.getParameterMetaData);
223
224=== modified file 'src/jdbc.xq.src/prepared/preparestatement.cpp'
225--- src/jdbc.xq.src/prepared/preparestatement.cpp 2012-12-27 22:23:41 +0000
226+++ src/jdbc.xq.src/prepared/preparestatement.cpp 2014-02-11 20:16:14 +0000
227@@ -29,12 +29,11 @@
228 const zorba::StaticContext* aStaticContext,
229 const zorba::DynamicContext* aDynamincContext) const
230 {
231+ String lConnectionUUID = JdbcModule::getStringArg(args, 0);
232+ String lQuery = JdbcModule::getStringArg(args, 1);
233 Item result;
234
235 JDBC_MODULE_TRY
236- String lConnectionUUID = JdbcModule::getStringArg(args, 0);
237- String lQuery = JdbcModule::getStringArg(args, 1);
238-
239 jobject oConnection = JdbcModule::getObject(aDynamincContext, lConnectionUUID, INSTANCE_MAP_CONNECTIONS);
240
241 jstring query = env->NewStringUTF(lQuery.c_str());
242
243=== modified file 'src/jdbc.xq.src/prepared/setboolean.cpp'
244--- src/jdbc.xq.src/prepared/setboolean.cpp 2012-12-27 22:23:41 +0000
245+++ src/jdbc.xq.src/prepared/setboolean.cpp 2014-02-11 20:16:14 +0000
246@@ -30,12 +30,12 @@
247 const zorba::StaticContext* aStaticContext,
248 const zorba::DynamicContext* aDynamincContext) const
249 {
250+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
251+
252 CHECK_CONNECTION
253 Item result;
254
255 JDBC_MODULE_TRY
256- String lStatementUUID = JdbcModule::getStringArg(args, 0);
257-
258 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
259
260 long index = (long)JdbcModule::getItemArg(args, 1).getLongValue();
261
262=== modified file 'src/jdbc.xq.src/prepared/setnull.cpp'
263--- src/jdbc.xq.src/prepared/setnull.cpp 2013-01-03 01:26:52 +0000
264+++ src/jdbc.xq.src/prepared/setnull.cpp 2014-02-11 20:16:14 +0000
265@@ -28,12 +28,12 @@
266 const zorba::StaticContext* aStaticContext,
267 const zorba::DynamicContext* aDynamincContext) const
268 {
269+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
270+
271 CHECK_CONNECTION
272 Item result;
273
274 JDBC_MODULE_TRY
275- String lStatementUUID = JdbcModule::getStringArg(args, 0);
276-
277 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
278
279 jobject oParameterMetadata = env->CallObjectMethod(oPreparedStatement, jPreparedStatement.getParameterMetaData);
280
281=== modified file 'src/jdbc.xq.src/prepared/setnumeric.cpp'
282--- src/jdbc.xq.src/prepared/setnumeric.cpp 2012-12-27 22:23:41 +0000
283+++ src/jdbc.xq.src/prepared/setnumeric.cpp 2014-02-11 20:16:14 +0000
284@@ -30,12 +30,12 @@
285 const zorba::StaticContext* aStaticContext,
286 const zorba::DynamicContext* aDynamincContext) const
287 {
288+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
289+
290 CHECK_CONNECTION
291 Item result;
292
293 JDBC_MODULE_TRY
294- String lStatementUUID = JdbcModule::getStringArg(args, 0);
295-
296 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
297
298 long index = (long)JdbcModule::getItemArg(args, 1).getLongValue();
299
300=== modified file 'src/jdbc.xq.src/prepared/setstring.cpp'
301--- src/jdbc.xq.src/prepared/setstring.cpp 2012-12-27 22:23:41 +0000
302+++ src/jdbc.xq.src/prepared/setstring.cpp 2014-02-11 20:16:14 +0000
303@@ -30,12 +30,12 @@
304 const zorba::StaticContext* aStaticContext,
305 const zorba::DynamicContext* aDynamincContext) const
306 {
307+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
308+
309 CHECK_CONNECTION
310 Item result;
311
312 JDBC_MODULE_TRY
313- String lStatementUUID = JdbcModule::getStringArg(args, 0);
314-
315 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
316
317 long index = (long)JdbcModule::getItemArg(args, 1).getLongValue();
318
319=== modified file 'src/jdbc.xq.src/prepared/setvalue.cpp'
320--- src/jdbc.xq.src/prepared/setvalue.cpp 2013-01-03 09:35:44 +0000
321+++ src/jdbc.xq.src/prepared/setvalue.cpp 2014-02-11 20:16:14 +0000
322@@ -30,12 +30,12 @@
323 const zorba::StaticContext* aStaticContext,
324 const zorba::DynamicContext* aDynamincContext) const
325 {
326+ String lStatementUUID = JdbcModule::getStringArg(args, 0);
327+
328 CHECK_CONNECTION
329 Item result;
330
331 JDBC_MODULE_TRY
332- String lStatementUUID = JdbcModule::getStringArg(args, 0);
333-
334 jobject oPreparedStatement = JdbcModule::getObject(aDynamincContext, lStatementUUID, INSTANCE_MAP_PREPAREDSTATEMENTS);
335
336 long index = (long)JdbcModule::getItemArg(args, 1).getLongValue();
337
338=== modified file 'src/jdbc.xq.src/statements/execute.cpp'
339--- src/jdbc.xq.src/statements/execute.cpp 2012-12-27 22:13:59 +0000
340+++ src/jdbc.xq.src/statements/execute.cpp 2014-02-11 20:16:14 +0000
341@@ -29,12 +29,13 @@
342 const zorba::StaticContext* aStaticContext,
343 const zorba::DynamicContext* aDynamincContext) const
344 {
345+ String lConnectionUUID = JdbcModule::getStringArg(args, 0);
346+ String lQuery = JdbcModule::getStringArg(args, 1);
347+
348 CHECK_CONNECTION
349 Item result;
350
351 JDBC_MODULE_TRY
352- String lConnectionUUID = JdbcModule::getStringArg(args, 0);
353- String lQuery = JdbcModule::getStringArg(args, 1);
354
355 jobject oConnection = JdbcModule::getObject(aDynamincContext, lConnectionUUID, INSTANCE_MAP_CONNECTIONS);
356
357
358=== modified file 'src/jdbc.xq.src/statements/executequery.cpp'
359--- src/jdbc.xq.src/statements/executequery.cpp 2012-12-27 22:13:59 +0000
360+++ src/jdbc.xq.src/statements/executequery.cpp 2014-02-11 20:16:14 +0000
361@@ -29,12 +29,13 @@
362 const zorba::StaticContext* aStaticContext,
363 const zorba::DynamicContext* aDynamincContext) const
364 {
365+ String lConnectionUUID = JdbcModule::getStringArg(args, 0);
366+ String lQuery = JdbcModule::getStringArg(args, 1);
367+
368 CHECK_CONNECTION
369 jobject result=NULL;
370
371 JDBC_MODULE_TRY
372- String lConnectionUUID = JdbcModule::getStringArg(args, 0);
373- String lQuery = JdbcModule::getStringArg(args, 1);
374
375 jobject oConnection = JdbcModule::getObject(aDynamincContext, lConnectionUUID, INSTANCE_MAP_CONNECTIONS);
376
377
378=== modified file 'src/jdbc.xq.src/statements/executeupdate.cpp'
379--- src/jdbc.xq.src/statements/executeupdate.cpp 2012-12-27 22:13:59 +0000
380+++ src/jdbc.xq.src/statements/executeupdate.cpp 2014-02-11 20:16:14 +0000
381@@ -30,12 +30,13 @@
382 const zorba::StaticContext* aStaticContext,
383 const zorba::DynamicContext* aDynamincContext) const
384 {
385+ String lConnectionUUID = JdbcModule::getStringArg(args, 0);
386+ String lQuery = JdbcModule::getStringArg(args, 1);
387+
388 CHECK_CONNECTION
389 Item result;
390
391 JDBC_MODULE_TRY
392- String lConnectionUUID = JdbcModule::getStringArg(args, 0);
393- String lQuery = JdbcModule::getStringArg(args, 1);
394
395 jobject oConnection = JdbcModule::getObject(aDynamincContext, lConnectionUUID, INSTANCE_MAP_CONNECTIONS);
396
397
398=== modified file 'src/jdbc.xq.src/transactions/commit.cpp'
399--- src/jdbc.xq.src/transactions/commit.cpp 2012-12-27 22:13:59 +0000
400+++ src/jdbc.xq.src/transactions/commit.cpp 2014-02-11 20:16:14 +0000
401@@ -28,11 +28,11 @@
402 const zorba::StaticContext* aStaticContext,
403 const zorba::DynamicContext* aDynamincContext) const
404 {
405+ String lStrUUID = JdbcModule::getStringArg(args, 0);
406+
407 CHECK_CONNECTION
408
409 JDBC_MODULE_TRY
410- String lStrUUID = JdbcModule::getStringArg(args, 0);
411-
412 jobject oConnection = JdbcModule::getObject(aDynamincContext, lStrUUID, INSTANCE_MAP_CONNECTIONS);
413
414 env->CallVoidMethod(oConnection, jConnection.commit);
415
416=== modified file 'src/jdbc.xq.src/transactions/rollback.cpp'
417--- src/jdbc.xq.src/transactions/rollback.cpp 2012-12-27 22:13:59 +0000
418+++ src/jdbc.xq.src/transactions/rollback.cpp 2014-02-11 20:16:14 +0000
419@@ -28,11 +28,11 @@
420 const zorba::StaticContext* aStaticContext,
421 const zorba::DynamicContext* aDynamincContext) const
422 {
423+ String lConnectionUUID = JdbcModule::getStringArg(args, 0);
424+
425 CHECK_CONNECTION
426
427 JDBC_MODULE_TRY
428- String lConnectionUUID = JdbcModule::getStringArg(args, 0);
429-
430 jobject oConnection = JdbcModule::getObject(aDynamincContext, lConnectionUUID, INSTANCE_MAP_CONNECTIONS);
431
432 jclass cConnection = jConnection.classID;
433
434=== modified file 'test/Queries/02-select.xq'
435--- test/Queries/02-select.xq 2013-06-11 20:47:52 +0000
436+++ test/Queries/02-select.xq 2014-02-11 20:16:14 +0000
437@@ -1,12 +1,16 @@
438 import module namespace jdbc = "http://www.zorba-xquery.com/modules/jdbc";
439
440+let $connection := jdbc:connect({
441+ "url": "jdbc:mysql://localhost:3307/",
442+ "user" : "root",
443+ "password" : ""})
444+return jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School02` /*!40100 DEFAULT CHARACTER SET latin1 */;");
445+
446 variable $connection := jdbc:connect({
447 "url": "jdbc:mysql://localhost:3307/",
448 "user" : "root",
449 "password" : ""});
450
451-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School02` /*!40100 DEFAULT CHARACTER SET latin1 */;");
452-
453 jdbc:execute-update($connection, "USE `School02`;");
454
455 (: Table structures :)

Subscribers

People subscribed via source and target branches

to all changes: