[jboss-cvs] JBossAS SVN: r73361 - trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2008-05-13 14:38:32 -0400 (Tue, 13 May 2008)
New Revision: 73361

Modified:
   trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java
Log:
[JBAS-4431] Revert patch

Modified: trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java	2008-05-13 18:34:49 UTC (rev 73360)
+++ trunk/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java	2008-05-13 18:38:32 UTC (rev 73361)
@@ -323,6 +323,9 @@
                   log.debug("Relation table not created as requested: " + cmrField.getQualifiedTableName());
                }
 
+               // create Indices if needed
+               createCMRIndex(dataSource, cmrField);
+
                if(relationMetaData.getCreateTable())
                {
                   issuePostCreateSQL(dataSource,
@@ -331,11 +334,6 @@
                }
             }
          }
-         if(createdTables.contains(relatedEntity.getEntityName()) || relationMetaData.getAlterTable())
-         {
-            // create Indices if needed
-            createCMRIndex(dataSource, cmrField);
-         }
       }
    }
 
@@ -350,10 +348,9 @@
          EntityBridge relatedEntity = cmrField.getRelatedEntity();
          JDBCRelationMetaData relationMetaData = cmrField.getMetaData().getRelationMetaData();
 
-         if(relationMetaData.isForeignKeyMappingStyle() && (createdTables.contains(relatedEntity.getEntityName()) ||
-                                                            relationMetaData.getAlterTable()))
+         if(relationMetaData.isForeignKeyMappingStyle() && (createdTables.contains(relatedEntity.getEntityName())))
          {
-            createCMRIndex(((JDBCAbstractEntityBridge)cmrField.getRelatedEntity()).getDataSource(), cmrField);
+            createCMRIndex(((JDBCAbstractEntityBridge)relatedEntity).getDataSource(), cmrField);
          }
 
          // Create fk constraint
@@ -918,8 +915,6 @@
    private void createFKIndex(JDBCRelationshipRoleMetaData metadata, DataSource dataSource, String tableName)
       throws DeploymentException
    {
-      SQLUtil.OldIndexes oldIndexes = SQLUtil.getOldIndexes(tableName, dataSource);
-
       Collection kfl = metadata.getKeyFields();
       Iterator it = kfl.iterator();
       while(it.hasNext())
@@ -927,11 +922,8 @@
          JDBCCMPFieldMetaData fi = (JDBCCMPFieldMetaData) it.next();
          if(metadata.isIndexed())
          {
-            if(!hasIndex(oldIndexes, fi.getColumnName()))
-            {
-               createIndex(dataSource, tableName, fi.getFieldName(), createIndexSQL(fi, tableName));
-               idxCount++;
-            }
+            createIndex(dataSource, tableName, fi.getFieldName(), createIndexSQL(fi, tableName));
+            idxCount++;
          }
       }
    }