[Isql-devevelopment] SF.net SVN: isql: [74] isql-core/branches/3.1.0-development/src/org/ isqlviewer

[<mk...@us...>]

Revision: 74
          http://svn.sourceforge.net/isql/?rev=74&view=rev
Author:   mkobold
Date:     2007-06-12 15:26:27 -0700 (Tue, 12 Jun 2007)

Log Message:
-----------
* Corrected query processing for variable substitutions.
* Added MonetDB and Gigaspaces drives to the default list of drivers.

Modified Paths:
--------------
    isql-core/branches/3.1.0-development/src/org/isqlviewer/resource/driver.properties
    isql-core/branches/3.1.0-development/src/org/isqlviewer/util/QueryExecutor.java

Modified: isql-core/branches/3.1.0-development/src/org/isqlviewer/resource/driver.properties
===================================================================
--- isql-core/branches/3.1.0-development/src/org/isqlviewer/resource/driver.properties	2007-06-07 02:03:11 UTC (rev 73)
+++ isql-core/branches/3.1.0-development/src/org/isqlviewer/resource/driver.properties	2007-06-12 22:26:27 UTC (rev 74)
@@ -26,3 +26,5 @@
 sun.jdbc.odbc.JdbcOdbcDriver=jdbc\:odbc\:odbcDataSource
 uk.co.thinksql.ThinkSQLDriver=jdbc\:thinksql\://hostname\:9075
 weblogic.jdbc.mssqlserver4.Driver=weblogic\:mssqlserver4\:hostname\:1433
+com.j_spaces.jdbc.driver.GDriver=jdbc:gigaspaces:url:rmi://<hostname>/./myCache
+nl.cwi.monetdb.jdbc.MonetDriver=jdbc:monetdb://localhost/database

Modified: isql-core/branches/3.1.0-development/src/org/isqlviewer/util/QueryExecutor.java
===================================================================
--- isql-core/branches/3.1.0-development/src/org/isqlviewer/util/QueryExecutor.java	2007-06-07 02:03:11 UTC (rev 73)
+++ isql-core/branches/3.1.0-development/src/org/isqlviewer/util/QueryExecutor.java	2007-06-12 22:26:27 UTC (rev 74)
@@ -110,10 +110,10 @@
             executionHistory.setType(CommandType.BATCH_QUERY);
             boolean logBatch = statements.length > 1;
             for (int i = 0; i < statements.length; i++) {
-                renderer.initialize();
                 String userQuery = statements[i].trim();
                 if (userQuery.length() > 0) {
                     try {
+                        renderer.initialize();
                         String substitutedQuery = doVariableSubstitutions(userQuery);
                         String nativeSQL = getNativeSql(connection, substitutedQuery);
                         Date queryTime = new Date();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.