db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r634037 [3/3] - in /db/derby/code/trunk/java: testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ testing/...
Date Wed, 05 Mar 2008 21:25:56 GMT
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_territory_sed.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_territory_sed.properties?rev=634037&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_territory_sed.properties
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_territory_sed.properties
Wed Mar  5 13:25:53 2008
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Filters and substitutes for SED
+# Multiple patterns for DELETE: comma separated
+#   delete=pattern1,pattern2,...,patternn
+# No commas can be allowed in the patterns.
+#
+# Multiple patterns for SUBSTITUTE: comma separated <pattern;substitute> pair
+#   substitute=pattern1;substitute1,pattern2;substitute2,...,patternn;substitut
+en
+# No commas or semicolons can be allowed in the patterns/subsitutes.
+-------------------------------------------------------------------------------
+--
+substitute=Source database is:.*$;Source database is: <dbPath>,Connection URL is:.*$;Connection
URL is: <dbURL>,Failed to load jar file.*$;Failed to load jar file <jarFilePath>,java.io.FileNotFoundException:
.*$;java.io.FileNotFoundException: <filePath>,CALL SQLJ.INSTALL_JAR.*$;CALL SQLJ.INSTALL_JAR(<maskedOutJarDesc>),java.sql.SQLException:
Driver not found: wombat;java.sql.SQLException: No suitable driver,DEBUG: Driver not found:
wombat;DEBUG: No suitable driver,SQL Exception: Driver not found: wombat;java.sql.SQLException:
No suitable driver

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test_territory_sed.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java?rev=634037&r1=634036&r2=634037&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java Wed Mar  5 13:25:53
2008
@@ -584,13 +584,16 @@
 		// have multiple ResultSets open on the same connection).
 		this.conn.setAutoCommit(false);
 
+		// Set the system schema to ensure that UCS_BASIC collation is used.
+		Statement stmt = conn.createStatement();
+		stmt.executeUpdate("SET SCHEMA SYS");
+
 		// Prepare statements.
 		getColNameFromNumberQuery = conn.prepareStatement(
 			"SELECT COLUMNNAME FROM SYS.SYSCOLUMNS WHERE " +
 			"REFERENCEID = ? AND COLUMNNUMBER = ?");
 
 		// Load list of user tables and table ids, for general use.
-		Statement stmt = conn.createStatement();
 		ResultSet rs = stmt.executeQuery("SELECT T.TABLEID, T.TABLENAME, " +
 				"S.SCHEMANAME FROM SYS.SYSTABLES T, SYS.SYSSCHEMAS S " + 
 				"WHERE T.TABLETYPE = 'T' AND T.SCHEMAID = S.SCHEMAID");



Mime
View raw message