[Hibernate-commits] Hibernate Code SVN: r10048 - in trunk/HibernateExt/tools/src: java/org/hibernate/cfg/reveng test/org/hibernate/tool/test/jdbc2cfg

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

Author: max...@jb...
Date: 2006-06-25 10:37:09 -0400 (Sun, 25 Jun 2006)
New Revision: 10048

Modified:
   trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCToHibernateTypeHelper.java
   trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/DefaultReverseEngineeringStrategyTest.java
Log:
HBX-693 Database columns with non-null integer data type maps to Java "Integer" instead of "int"

Modified: trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCToHibernateTypeHelper.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCToHibernateTypeHelper.java	2006-06-25 14:36:12 UTC (rev 10047)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/cfg/reveng/JDBCToHibernateTypeHelper.java	2006-06-25 14:37:09 UTC (rev 10048)
@@ -73,7 +73,7 @@
 			   return returnNullable?Short.class.getName():"short";
 		   }
 		   else if (precision < 10) {
-			   return returnNullable?Integer.class.getName():"integer";
+			   return returnNullable?Integer.class.getName():"int";
 		   }
 		   else if (precision < 19) {
 			   return returnNullable?Long.class.getName():"long";

Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/DefaultReverseEngineeringStrategyTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/DefaultReverseEngineeringStrategyTest.java	2006-06-25 14:36:12 UTC (rev 10047)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/test/jdbc2cfg/DefaultReverseEngineeringStrategyTest.java	2006-06-25 14:37:09 UTC (rev 10048)
@@ -107,6 +107,8 @@
 
     public void testPreferredTypes() {
     	assertEquals("int",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, false, false));
+    	assertEquals("because nullable it should not be int", "java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false));
+    	assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.NUMERIC,0,9,0, true, false));
        	assertEquals("java.lang.Integer",rns.columnToHibernateTypeName(null, "bogus",Types.INTEGER,0,0,0, true, false));			
        	assertEquals("serializable",rns.columnToHibernateTypeName(new TableIdentifier("sdf"), "bogus",-567,0,0,0, false, false));