[Hibernate-commits] Hibernate Code SVN: r9910 - trunk/Hibernate3/src/org/hibernate/dialect

[<hib...@li...>]

Author: max...@jb...
Date: 2006-05-08 17:41:28 -0400 (Mon, 08 May 2006)
New Revision: 9910

Modified:
   trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java
Log:
more ejb3 cma.

Modified: trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java
===================================================================
--- trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-05-08 21:14:20 UTC (rev 9909)
+++ trunk/Hibernate3/src/org/hibernate/dialect/Dialect.java	2006-05-08 21:41:28 UTC (rev 9910)
@@ -105,18 +105,18 @@
 				else if ( columnType == Hibernate.BIG_DECIMAL ) {
 					return Hibernate.BIG_DECIMAL;
 				}
+				else if ( columnType == Hibernate.LONG || columnType == Hibernate.SHORT || columnType == Hibernate.INTEGER) {
+					return Hibernate.LONG;
+				}
 				else if ( columnType == Hibernate.FLOAT || columnType == Hibernate.DOUBLE) {
 					return Hibernate.DOUBLE;
-				}
+				} 
 				
-				// finally use the sqltype if == on Hibernate types did not find a match.
-				if ( sqlType == Types.BIGINT) {
-					return Hibernate.BIG_INTEGER;
-				} 
-				else if ( sqlType == Types.FLOAT || sqlType == Types.DOUBLE || sqlType == Types.NUMERIC || sqlType == Types.DECIMAL || sqlType == Types.REAL) {
+				// finally use the sqltype if == on Hibernate types did not find a match.				
+				if ( sqlType == Types.FLOAT || sqlType == Types.DOUBLE || sqlType == Types.NUMERIC || sqlType == Types.DECIMAL || sqlType == Types.REAL) {
 					return Hibernate.DOUBLE;
 				} 
-				else if ( sqlType == Types.INTEGER || sqlType == Types.SMALLINT || sqlType == Types.TINYINT ) {
+				else if ( sqlType == Types.BIGINT || sqlType == Types.INTEGER || sqlType == Types.SMALLINT || sqlType == Types.TINYINT ) {
 					return Hibernate.LONG;
 				}
 				else {