added a new naming convention on plural names when determining primary keys name

Author: Robin Komiwes

src/main/java/com/spreadthesource/tapestry/dbmigration/migrations/impl/ConstraintImpl.java

@@ -12,7 +12,7 @@
 
 public class ConstraintImpl extends AbstractMigrationContext implements Constraint
 {
-    private String name;
+    private String tableName;
 
     private List<String> foreignKeys = new ArrayList<String>();
 
@@ -48,7 +48,7 @@ public void setForeignKey(String name, String foreignTable, String[] fromToColum
 
     public void setTableName(String tableName)
     {
-        this.name = tableName;
+        this.tableName = tableName;
     }
 
     public void setUnique(String name, String... columns)
@@ -59,12 +59,12 @@ public void setUnique(String name, String... columns)
 
     public List<String> getQueries()
     {
-        if (name == null) { throw new IllegalArgumentException(
+        if (tableName == null) { throw new IllegalArgumentException(
                 "Table name cannot be null to generate constraint query string."); }
 
         List<String> result = new ArrayList<String>();
 
-        org.hibernate.mapping.Table hTable = new org.hibernate.mapping.Table(name);
+        org.hibernate.mapping.Table hTable = new org.hibernate.mapping.Table(tableName);
 
         // Add foreign keys alter queries
         for (String query : foreignKeys)

src/main/java/com/spreadthesource/tapestry/dbmigration/utils/MigrationUtils.java

@@ -1,5 +1,6 @@
 package com.spreadthesource.tapestry.dbmigration.utils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -24,10 +25,42 @@ public final static boolean checkIfImplements(Class<?> clazz, Class<?> inter)
 
     public final static String buildPkColumnId(String tableName)
     {
-        return (tableName.charAt(0) + tableName.substring(1).replaceAll("([A-Z])", "_$1"))
-                .toLowerCase()
+        return singularizeWords((tableName.charAt(0) + tableName.substring(1).replaceAll("([A-Z])", "_$1"))
+                .toLowerCase(), "_")
                 + "_id";
     }
+    
+    public final static String singularizeWords(String words, String separator) {
+        StringBuffer singularWords = new StringBuffer();
+        
+        String[] wordsArray = words.split(separator);
+        
+        int length = wordsArray.length;
+        for (int i = 0; i < length;i++)
+        {
+            String word = wordsArray[i];
+            
+            singularWords.append(singularize(word));
+            
+            if (i + 1 < length)
+                singularWords.append("_");
+        }
+        
+        return singularWords.toString();   
+    }
+    
+    /**
+     * Convert a plural word to a singular word.
+     * If word ends with "ies", like activities, then "ies" is replaced by "y".
+     * Else final "s" is removed.
+     */
+    public final static String singularize(String pluralWord) {
+        if (!pluralWord.endsWith("s"))
+            return pluralWord;
+        
+        int length = pluralWord.length();
+        return pluralWord.endsWith("ies") ? pluralWord.substring(0, length - 3) + "y" : pluralWord.substring(0, length - 1);
+    }
 
     /**
      * Build a hibernate column given our wrapper representation.