zorba-coders team mailing list archive

[Chris Hillery <chillery+launchpad@xxxxxxxxx>]

Chris Hillery has proposed merging lp:~zorba-coders/zorba/jdbc-ctest-j8 into lp:zorba/jdbc-module.

Commit message:
Modify JDBC tests to use distinct databases, so they may be run in parallel.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/jdbc-ctest-j8/+merge/147336
-- 
https://code.launchpad.net/~zorba-coders/zorba/jdbc-ctest-j8/+merge/147336
Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module.

=== modified file 'test/Queries/01-creatingDB.xq'
--- test/Queries/01-creatingDB.xq	2013-01-10 02:09:49 +0000
+++ test/Queries/01-creatingDB.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
 
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School01` /*!40100 DEFAULT CHARACTER SET latin1 */;");
   
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School01`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/02-select.xq'
--- test/Queries/02-select.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/02-select.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School02` /*!40100 DEFAULT CHARACTER SET latin1 */;");
   
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School02`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/03-connect-options.xq'
--- test/Queries/03-connect-options.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/03-connect-options.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School03` /*!40100 DEFAULT CHARACTER SET latin1 */;");
 
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School03`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/04-set-null.xq'
--- test/Queries/04-set-null.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/04-set-null.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School04` /*!40100 DEFAULT CHARACTER SET latin1 */;");
 
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School04`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/05-result-set.xq'
--- test/Queries/05-result-set.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/05-result-set.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School05` /*!40100 DEFAULT CHARACTER SET latin1 */;");
 
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School05`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/06-prepare.xq'
--- test/Queries/06-prepare.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/06-prepare.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School06` /*!40100 DEFAULT CHARACTER SET latin1 */;");
 
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School06`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/07-prepare.xq'
--- test/Queries/07-prepare.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/07-prepare.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School07` /*!40100 DEFAULT CHARACTER SET latin1 */;");
 
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School07`;");
 
 (: Table structures :)
 

=== modified file 'test/Queries/08-deletingDB.xq'
--- test/Queries/08-deletingDB.xq	2013-01-10 19:42:27 +0000
+++ test/Queries/08-deletingDB.xq	2013-02-08 10:20:27 +0000
@@ -5,9 +5,9 @@
   "user" : "root",
   "password" : ""});
   
-jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School` /*!40100 DEFAULT CHARACTER SET latin1 */;");
+jdbc:execute-update($connection, "CREATE DATABASE /*!32312 IF NOT EXISTS*/`School08` /*!40100 DEFAULT CHARACTER SET latin1 */;");
 
-jdbc:execute-update($connection, "USE `School`;");
+jdbc:execute-update($connection, "USE `School08`;");
 
 (: Table structures :)