Fix column type resolution and allow method chaining on Column

Author: ccordenier

src/main/java/com/spreadthesource/tapestry/dbmigration/data/Column.java

@@ -51,39 +51,43 @@ public String getName() {
         return name;
     }
 
-    public void setUnique(boolean unique)
+    public Column setUnique(boolean unique)
     {
         this.unique = unique;
+        return this;
     }
 
     public boolean isUnique()
     {
         return unique || primary;
     }
 
-    public void setLength(int length)
+    public Column setLength(int length)
     {
         this.length = length;
+        return this;
     }
 
     public Integer getLength()
     {
         return length;
     }
 
-    public void setPrimary(boolean primary)
+    public Column setPrimary(boolean primary)
     {
         this.primary = primary;
+        return this;
     }
 
     public boolean isPrimary()
     {
         return primary;
     }
 
-    public void setNotNull(boolean notNull)
+    public Column setNotNull(boolean notNull)
     {
         this.notNull = notNull;
+        return this;
     }
 
     public boolean isNotNull()
@@ -92,10 +96,10 @@ public boolean isNotNull()
     }
 
 
-
-    public void setIdentityGenerator(String identityGenerator)
+    public Column setIdentityGenerator(String identityGenerator)
     {
         this.identityGenerator = identityGenerator;
+        return this;
     }
 
     public String getIdentityGenerator()

src/main/java/com/spreadthesource/tapestry/dbmigration/services/MigrationHelperImpl.java

@@ -180,7 +180,7 @@ public List<String> createTable(Table table)
                     SimpleValue idValue = new SimpleValue(hTable);
                     idValue.setIdentifierGeneratorStrategy("identity");
 
-                    idValue.setTypeName(dialect.getTypeName(column.getType()));
+                    idValue.setTypeName(dialect.getHibernateTypeName(column.getType()));
 
                     hColumn.setValue(idValue);
 

src/main/java/com/spreadthesource/tapestry/dbmigration/services/MigrationManagerImpl.java

@@ -13,7 +13,6 @@
 import org.apache.tapestry5.ioc.annotations.Symbol;
 import org.apache.tapestry5.ioc.services.ClassNameLocator;
 import org.hibernate.Hibernate;
-import org.hibernate.Session;
 import org.hibernate.sql.Insert;
 import org.hibernate.sql.JoinFragment;
 import org.hibernate.sql.QuerySelect;
@@ -43,7 +42,6 @@ public class MigrationManagerImpl implements MigrationManager
     public MigrationManagerImpl(
             Collection<String> packages,
             Logger logger,
-            Session session,
             ClassNameLocator classNameLocator,
             ObjectLocator objectLocator,
             MigrationRunner runner,
@@ -93,12 +91,13 @@ public Integer current()
 
         try
         {
-            if (r.next()) {
+            if (r.next())
+            {
                 Integer version = r.getInt("version");
                 log.debug("Current version is : " + version);
                 return version;
             }
-                
+
         }
         catch (SQLException e)
         {
@@ -111,9 +110,8 @@ public Integer current()
     public Integer down()
     {
         Integer current = current();
-        if (current.equals(0))
-            return current;
-        
+        if (current.equals(0)) return current;
+
         String className = classes.get(current);
 
         if (className == null)
@@ -122,12 +120,14 @@ public Integer down()
         Migration migration = getMigration(className);
 
         migration.down();
-        
+
         runner.update(migration.getPendingSQL());
 
-        SortedMap<Integer, String> previousMigrations = (new TreeMap<Integer, String>(classes)).headMap(current);
+        SortedMap<Integer, String> previousMigrations = (new TreeMap<Integer, String>(classes))
+                .headMap(current);
 
-        if (previousMigrations.size() < 1) {
+        if (previousMigrations.size() < 1)
+        {
             recordVersion(0);
             return 0;
         }
@@ -142,8 +142,9 @@ public Integer down()
     public Integer up()
     {
         Integer current = current();
-        
-        SortedMap<Integer, String> pendingMigrations = (new TreeMap<Integer, String>(classes)).tailMap(current);
+
+        SortedMap<Integer, String> pendingMigrations = (new TreeMap<Integer, String>(classes))
+                .tailMap(current);
 
         pendingMigrations.remove(current);
         Iterator<Integer> iterator = pendingMigrations.keySet().iterator();
@@ -187,16 +188,15 @@ public void initialize()
     public Integer migrate()
     {
         Integer current = current();
-        
-        if (current == null)
-            initialize();
-        
+
+        if (current == null) initialize();
+
         Integer next = up();
 
         while (!current.equals(next))
         {
             current = next;
-            
+
             next = up();
         }
 
@@ -224,7 +224,7 @@ private void recordVersion(Integer version)
         Insert insert = new Insert(helper.getDialect());
         insert.setTableName(versioningTableName);
         insert.addColumn("version", version.toString());
-        insert.addColumn("datetime","'" + Hibernate.TIMESTAMP.toString(now) + "'");
+        insert.addColumn("datetime", "'" + Hibernate.TIMESTAMP.toString(now) + "'");
 
         runner.update(insert.toStatementString());
     }
@@ -233,7 +233,8 @@ private Integer getMigrationVersion(String className)
     {
         try
         {
-            if (MigrationUtils.checkIfImplements(Class.forName(className), MigrationBase.class)) return null;
+            if (MigrationUtils.checkIfImplements(Class.forName(className), MigrationBase.class))
+                return null;
 
             Version version = Class.forName(className).getAnnotation(Version.class);
 
@@ -251,7 +252,8 @@ private Migration getMigration(String className)
     {
         try
         {
-            if (MigrationUtils.checkIfImplements(Class.forName(className), MigrationBase.class)) return null;
+            if (MigrationUtils.checkIfImplements(Class.forName(className), MigrationBase.class))
+                return null;
 
             Version version = Class.forName(className).getAnnotation(Version.class);
 

src/test/resources/hibernate.h2.cfg.xml

@@ -10,7 +10,7 @@
 		<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
 		<property name="hibernate.connection.url">jdbc:h2:/tmp/dbmigrations</property>
 		<!--  property name="hibernate.hbm2ddl.auto">update</property-->
-        <property name="hibernate.show_sql">false</property>
+        <property name="hibernate.show_sql">true</property>
 
 	</session-factory>
 </hibernate-configuration>