db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject cvs commit: db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb OjbTagsHandler.java
Date Mon, 22 Dec 2003 10:11:16 GMT
tomdz       2003/12/22 02:11:16

  Modified:    src/xdoclet/java/src/xdoclet/modules/ojb OjbTagsHandler.java
  Log:
  Fixed bugs in
  - jdbc type mapping
  - modification of id field of inherited field
  
  Revision  Changes    Path
  1.2       +10 -11    db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java
  
  Index: OjbTagsHandler.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/xdoclet/java/src/xdoclet/modules/ojb/OjbTagsHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OjbTagsHandler.java	15 Dec 2003 20:09:13 -0000	1.1
  +++ OjbTagsHandler.java	22 Dec 2003 10:11:16 -0000	1.2
  @@ -214,30 +214,28 @@
           jdbcMappings.put("byte", "TINYINT");
           jdbcMappings.put("short", "SMALLINT");
           jdbcMappings.put("int", "INTEGER");
  -        jdbcMappings.put("long", "INTEGER");
  +        jdbcMappings.put("long", "BIGINT");
           jdbcMappings.put("char", "CHAR");
  -        jdbcMappings.put("float", "FLOAT");
  -        jdbcMappings.put("double", "DOUBLE");
  +        jdbcMappings.put("float", "REAL");
  +        jdbcMappings.put("double", "FLOAT");
           jdbcMappings.put("java.lang.Boolean", "BIT");
           jdbcMappings.put("java.lang.Byte", "TINYINT");
           jdbcMappings.put("java.lang.Short", "SMALLINT");
           jdbcMappings.put("java.lang.Integer", "INTEGER");
  -        jdbcMappings.put("java.lang.Long", "INTEGER");
  +        jdbcMappings.put("java.lang.Long", "BIGINT");
           jdbcMappings.put("java.lang.Character", "CHAR");
  -        jdbcMappings.put("java.lang.Float", "FLOAT");
  -        jdbcMappings.put("java.lang.Double", "DOUBLE");
  +        jdbcMappings.put("java.lang.Float", "REAL");
  +        jdbcMappings.put("java.lang.Double", "FLOAT");
           jdbcMappings.put("java.lang.String", "VARCHAR");
  -        jdbcMappings.put("java.util.Date", "TIMESTAMP");
  +        jdbcMappings.put("java.util.Date", "DATE");
           jdbcMappings.put("java.sql.Blob", "BLOB");
           jdbcMappings.put("java.sql.Clob", "CLOB");
  -        jdbcMappings.put("java.sql.Date", "TIMESTAMP");
  -        jdbcMappings.put("java.sql.Time", "TIMESTAMP");
  +        jdbcMappings.put("java.sql.Date", "DATE");
  +        jdbcMappings.put("java.sql.Time", "TIME");
           jdbcMappings.put("java.sql.Timestamp", "TIMESTAMP");
  -        jdbcMappings.put("java.math.BigInteger", "BIGINT");
           jdbcMappings.put("java.math.BigDecimal", "DECIMAL");
           jdbcMappings.put("org.apache.ojb.broker.util.GUID", "VARCHAR");
           // conversions
  -        jdbcConversions.put("java.util.Date", "org.apache.ojb.broker.accesslayer.conversions.JavaDate2SqlTimestampFieldConversion");
           jdbcConversions.put("org.apache.ojb.broker.util.GUID", "org.apache.ojb.broker.accesslayer.conversions.GUID2StringFieldConversion");
           // lengths
           jdbcLengths.put("CHAR", "1");
  @@ -1405,6 +1403,7 @@
                       !fieldsWithId.contains(name))
                   {
                       fieldsWithId.add(name);
  +                    fieldsWithoutId.remove(name);
                   }
               }
           }
  
  
  

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


Mime
View raw message