Author: thomas.heute(a)jboss.com Date: 2009-01-28 14:47:33 -0500 (Wed, 28 Jan 2009) New Revision: 12687 Modified: branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/OracleStringUserType.java Log: Use correct dialects Modified: branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java 2009-01-28 19:18:03 UTC (rev 12686) +++ branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java 2009-01-28 19:47:33 UTC (rev 12687) @@ -23,6 +23,9 @@ package org.jboss.portal.jems.hibernate; import org.hibernate.HibernateException; +import org.hibernate.dialect.Oracle10gDialect; +import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.Oracle9iDialect; import java.util.HashMap; import java.util.Map; @@ -91,29 +94,33 @@ private static final Map MAPPERS = new HashMap(); - static - { - // TODO : this is the stuff it'd be nice to move to a properties file or some other easily user-editable place - MAPPERS.put("HSQL Database Engine", new VersionInsensitiveMapper("org.hibernate.dialect.HSQLDialect")); - MAPPERS.put("DB2/NT", new VersionInsensitiveMapper("org.hibernate.dialect.DB2Dialect")); - MAPPERS.put("MySQL", new VersionInsensitiveMapper("org.hibernate.dialect.MySQLDialect")); - MAPPERS.put("PostgreSQL", new VersionInsensitiveMapper("org.hibernate.dialect.PostgreSQLDialect")); - MAPPERS.put("Microsoft SQL Server Database", new VersionInsensitiveMapper("org.hibernate.dialect.SQLServerDialect")); - MAPPERS.put("Microsoft SQL Server", new VersionInsensitiveMapper("org.hibernate.dialect.SQLServerDialect")); - MAPPERS.put("Sybase SQL Server", new VersionInsensitiveMapper("org.hibernate.dialect.SybaseDialect")); - MAPPERS.put("Informix Dynamic Server", new VersionInsensitiveMapper("org.hibernate.dialect.InformixDialect")); + static { + // TODO : this is the stuff it'd be nice to move to a properties file or some other easily user-editable place + MAPPERS.put( "HSQL Database Engine", new VersionInsensitiveMapper( "org.hibernate.dialect.HSQLDialect" ) ); + MAPPERS.put( "DB2/NT", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) ); + MAPPERS.put( "DB2/LINUX", new VersionInsensitiveMapper( "org.hibernate.dialect.DB2Dialect" ) ); + MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.hibernate.dialect.MySQLDialect" ) ); + MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.hibernate.dialect.PostgreSQLDialect" ) ); + MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.hibernate.dialect.SQLServerDialect" ) ); + MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.hibernate.dialect.SQLServerDialect" ) ); + MAPPERS.put( "Sybase SQL Server", new VersionInsensitiveMapper( "org.hibernate.dialect.SybaseDialect" ) ); + MAPPERS.put( "Adaptive Server Enterprise", new VersionInsensitiveMapper( "org.hibernate.dialect.SybaseDialect" ) ); + MAPPERS.put( "Informix Dynamic Server", new VersionInsensitiveMapper( "org.hibernate.dialect.InformixDialect" ) ); + MAPPERS.put( "Apache Derby", new VersionInsensitiveMapper( "org.hibernate.dialect.DerbyDialect" ) ); - MAPPERS.put( - "Oracle", - new DatabaseDialectMapper() - { - public String getDialectClass(int majorVersion) - { - return majorVersion > 8 - ? "org.hibernate.dialect.Oracle9Dialect" - : "org.hibernate.dialect.OracleDialect"; - } - } - ); - } + MAPPERS.put( + "Oracle", + new DatabaseDialectMapper() { + public String getDialectClass(int majorVersion) { + switch ( majorVersion ) { + case 8: return Oracle8iDialect.class.getName(); + case 9: return Oracle9iDialect.class.getName(); + case 10: return Oracle10gDialect.class.getName(); + default: throw new HibernateException( "unknown Oracle major version [" + majorVersion + "]" ); + } + } + } + ); + } + } Modified: branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/OracleStringUserType.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/OracleStringUserType.java 2009-01-28 19:18:03 UTC (rev 12686) +++ branches/Enterprise_Portal_Platform_4_3/jems/src/main/org/jboss/portal/jems/hibernate/OracleStringUserType.java 2009-01-28 19:47:33 UTC (rev 12687) @@ -30,9 +30,6 @@ import org.hibernate.Hibernate; import org.hibernate.HibernateException; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.Oracle9Dialect; -import org.hibernate.dialect.OracleDialect; import org.hibernate.usertype.UserType; /**