Changeset 1887

Timestamp:

05/15/09 14:42:55 (3 years ago)

Author:

eitan

Message:

fix for possible duplicate column name in hibernate mapping

Files:

• jmatter-complet/trunk/jmatter/src/com/u2d/persist/HBMMaker.java (modified) (3 diffs)

jmatter-complet/trunk/jmatter/src/com/u2d/persist/HBMMaker.java

@@ -41 +41 @@
-   private Document _doc;
-   private boolean _joinedSubclass = false;
-
+
-   public HBMMaker(Class clazz)
-   {
@@ -582 +582 @@
-            else
-            {
-propElem.addAttribute("column", prefix + "_" + field.name()
+addColumnAttribute(propElem, prefix, field
-            }
-         }
@@ -605 +605 @@
-      addAccessAttribute(propElem);
-      return propElem;
+   }
+
+   private Set<String> colNames = new HashSet<String>();
+   /* ensure unique column names */
+   private void addColumnAttribute(Element propElem, String prefix, Field field)
+   {
+      String colName = String.format("%s_%s", prefix, field.name());
+      int i=2;
+      while (colNames.contains(colName))
+      {
+         colName = String.format("%s%d_%s", prefix, i++, field.name());
+      }
+      propElem.addAttribute("column", colName);
+      colNames.add(colName);
-   }
-