Return-Path: 
 <torque-dev-return-10111-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-torque-dev-archive@www.apache.org
Received: (qmail 92927 invoked from network); 23 Nov 2010 21:57:29 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 23 Nov 2010 21:57:29 -0000
Received: (qmail 94487 invoked by uid 500); 23 Nov 2010 21:58:01 -0000
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 94467 invoked by uid 500); 23 Nov 2010 21:58:01 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Apache Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Apache Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 94459 invoked by uid 500); 23 Nov 2010 21:58:01 -0000
Received: (qmail 94454 invoked by uid 99); 23 Nov 2010 21:58:01 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 21:58:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Nov 2010 21:57:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D118E238897D; Tue, 23 Nov 2010 21:56:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1038355 -
 /db/torque/village/trunk/src/java/com/workingdogs/village/Schema.java
Date: Tue, 23 Nov 2010 21:56:25 -0000
To: torque-commits@db.apache.org
From: tv@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101123215625.D118E238897D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tv
Date: Tue Nov 23 21:56:25 2010
New Revision: 1038355

URL: http://svn.apache.org/viewvc?rev=1038355&view=rev
Log:
Attempt to fix case-sensitivity and Oracle metadata problems

Modified:
    db/torque/village/trunk/src/java/com/workingdogs/village/Schema.java

Modified: db/torque/village/trunk/src/java/com/workingdogs/village/Schema.java
URL: http://svn.apache.org/viewvc/db/torque/village/trunk/src/java/com/workingdogs/village/Schema.java?rev=1038355&r1=1038354&r2=1038355&view=diff
==============================================================================
--- db/torque/village/trunk/src/java/com/workingdogs/village/Schema.java (original)
+++ db/torque/village/trunk/src/java/com/workingdogs/village/Schema.java Tue Nov 23 21:56:25 2010
@@ -32,6 +32,8 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * The Schema object represents the <a href="Column.html">Columns</a> in a database table. It contains a collection of <a
@@ -54,7 +56,7 @@ public final class Schema
 
     /** TODO: DOCUMENT ME! */
     private Column [] columns;
-    private Hashtable columnNumberByName;
+    private Map columnNumberByName;
 
     /** TODO: DOCUMENT ME! */
     private static final Hashtable schemaCache = new Hashtable();
@@ -186,15 +188,11 @@ public final class Schema
                 {
                     String sql = "SELECT " + columnsAttribute + " FROM " + tableName + " WHERE 1 = -1";
 
-                    /*
-                     *  prepare dummy query as recommended by John Goodson in
-                     *  http://www.theserverside.com/news/1365579/Using-Database-MetaData-methods-appropriately
-                     */
                     stmt = conn.prepareStatement(sql);
 
-                    // query is never executed on the server - only prepared
                     if (stmt != null)
                     {
+                        stmt.executeQuery();
                         tableSchema = this;
                         tableSchema.setTableName(tableName);
                         tableSchema.setAttributes(columnsAttribute);
@@ -461,7 +459,7 @@ public final class Schema
     {
         this.numberOfColumns = meta.getColumnCount();
         columns = new Column[numberOfColumns() + 1];
-        columnNumberByName = new Hashtable((int) ((1.25 * numberOfColumns) + 1));
+        columnNumberByName = new TreeMap(String.CASE_INSENSITIVE_ORDER);
 
         String connURL = (conn != null) ? conn.getMetaData().getURL() : null;
 
@@ -604,7 +602,7 @@ public final class Schema
     {
         List cols = new ArrayList();
         String tableName = null;
-        columnNumberByName = new Hashtable();
+        columnNumberByName = new TreeMap(String.CASE_INSENSITIVE_ORDER);
 
         while (dbMeta.next())
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org