You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by fl...@apache.org on 2003/02/21 13:44:10 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb DBSchema.java

florianbruckner    2003/02/21 04:44:10

  Modified:    src/java/org/apache/ojb/tools/mapping/reversedb
                        DBSchema.java
  Log:
  add support for PointBase. The version distributed with Sun ONE AppServer
  returns a mixed case catalog name ("PointBase") in getCatalogs() and an upper
  case catalog name in getTables().
  
  Revision  Changes    Path
  1.5       +7 -2      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb/DBSchema.java
  
  Index: DBSchema.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb/DBSchema.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DBSchema.java	28 Jan 2003 21:42:53 -0000	1.4
  +++ DBSchema.java	21 Feb 2003 12:44:10 -0000	1.5
  @@ -121,8 +121,10 @@
         String strSchemaName = rs.getString("TABLE_SCHEM");
         String strTableName = rs.getString("TABLE_NAME");
         String strTableType = rs.getString("TABLE_TYPE");
  +      // Pointbase returns the catalog name in uppercase here and in mixed
  +      // case in getCatalogs(). Therefore we have to user toUpper().
         if (   
  -             (strTableCat == null && this.getDBCatalog().getCatalogName() == null || strTableCat.equals(this.getDBCatalog().getCatalogName()))
  +             (strTableCat == null && this.getDBCatalog().getCatalogName() == null || strTableCat.equals(this.getDBCatalog().getCatalogName().toUpperCase()))
              &&(strSchemaName == null && this.getSchemaName() == null || strSchemaName.equals(this.getSchemaName()))
            )
           this.addTable(strTableName, strTableType);
  @@ -272,6 +274,11 @@
   
   /***************************** Changelog *****************************
   // $Log$
  +// Revision 1.5  2003/02/21 12:44:10  florianbruckner
  +// add support for PointBase. The version distributed with Sun ONE AppServer
  +// returns a mixed case catalog name ("PointBase") in getCatalogs() and an upper
  +// case catalog name in getTables().
  +//
   // Revision 1.4  2003/01/28 21:42:53  florianbruckner
   // update XML generation
   //