Return-Path: 
 <commons-dev-return-18674-qmlist-jakarta-archive-commons-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-commons-dev-archive@apache.org
Received: (qmail 42139 invoked from network); 28 Oct 2002 16:17:42 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 28 Oct 2002 16:17:42 -0000
Received: (qmail 26380 invoked by uid 97); 28 Oct 2002 16:18:18 -0000
Delivered-To: qmlist-jakarta-archive-commons-dev@jakarta.apache.org
Received: (qmail 26215 invoked by uid 97); 28 Oct 2002 16:18:17 -0000
Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:commons-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:commons-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:commons-dev-help@jakarta.apache.org>
List-Post: <mailto:commons-dev@jakarta.apache.org>
List-Id: "Jakarta Commons Developers List" <commons-dev.jakarta.apache.org>
Reply-To: "Jakarta Commons Developers List" <commons-dev@jakarta.apache.org>
Delivered-To: mailing list commons-dev@jakarta.apache.org
Received: (qmail 26024 invoked by uid 97); 28 Oct 2002 16:18:14 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 28 Oct 2002 16:17:13 -0000
Message-ID: <20021028161713.16863.qmail@icarus.apache.org>
From: jstrachan@apache.org
To: jakarta-commons-sandbox-cvs@apache.org
Subject: cvs commit:
 jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean
 DynaSql.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jstrachan    2002/10/28 08:17:13

  Modified:    sql/src/java/org/apache/commons/sql/builder
                        PostgreSqlBuilder.java AxionBuilder.java
               sql/src/java/org/apache/commons/sql/dynabean DynaSql.java
  Log:
  applied J. Russell Smyth 's patches
  
  various minor patches to ensure things still work with the slight modificaitons to the model
  
  Revision  Changes    Path
  1.3       +4 -4      jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/PostgreSqlBuilder.java
  
  Index: PostgreSqlBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/PostgreSqlBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PostgreSqlBuilder.java	23 Sep 2002 16:53:24 -0000	1.2
  +++ PostgreSqlBuilder.java	28 Oct 2002 16:17:11 -0000	1.3
  @@ -116,13 +116,13 @@
        */
       protected String getSqlType(Column column) {
   
  -        if (column.getTypeString().equalsIgnoreCase("VARBINARY"))
  +        if (column.getTypeCode() == java.sql.Types.VARBINARY)
           {
               return "OID";
           }
           else
           {
  -            return column.getTypeString();
  +            return super.getSqlType(column);
           }
       }
   
  
  
  
  1.4       +2 -0      jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/AxionBuilder.java
  
  Index: AxionBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/builder/AxionBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AxionBuilder.java	23 Sep 2002 16:55:18 -0000	1.3
  +++ AxionBuilder.java	28 Oct 2002 16:17:11 -0000	1.4
  @@ -70,6 +70,7 @@
   import org.apache.commons.sql.model.Column;
   import org.apache.commons.sql.model.Database;
   import org.apache.commons.sql.model.Table;
  +import org.apache.commons.sql.model.TypeMap;
   
   /**
    * An SQL Builder for the <a href="http://axion.tigris.org/">Axion</a> JDBC database.
  @@ -88,6 +89,7 @@
           // Axion doesn't support text width specification 
           return column.getType();
       }
  +    
       protected void writePrimaryKeys(Table table) throws IOException {
           // disable primary key constraints
       }
  
  
  
  1.8       +1 -1      jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/DynaSql.java
  
  Index: DynaSql.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/DynaSql.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DynaSql.java	18 Oct 2002 00:33:16 -0000	1.7
  +++ DynaSql.java	28 Oct 2002 16:17:12 -0000	1.8
  @@ -544,7 +544,7 @@
   
           Object value = dynaBean.get(property.getName());
           if (value == null) {
  -            statement.setNull(sqlIndex, property.getColumn().getSQLTypeCode());
  +            statement.setNull(sqlIndex, property.getColumn().getTypeCode());
           }
           else {
               statement.setObject(sqlIndex, value);
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>