User: dsundstrom Date: 01/11/29 11:09:15 Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc JDBCStartCommand.java Log: Added support for pk constraint to relation-tables. Revision Changes Path 1.9 +15 -14 jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java Index: JDBCStartCommand.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStartCommand.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- JDBCStartCommand.java 2001/11/28 11:32:54 1.8 +++ JDBCStartCommand.java 2001/11/29 19:09:15 1.9 @@ -32,7 +32,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Joe Shevland</a> * @author <a href="mailto:[EMAIL PROTECTED]">Justin Forder</a> * @author <a href="mailto:[EMAIL PROTECTED]">Michel de Groot</a> - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public class JDBCStartCommand implements StartCommand { @@ -113,6 +113,7 @@ statement = con.createStatement(); // execute sql + log.debug("Executing SQL: " + sql); statement.executeUpdate(sql); // commit the transaction @@ -207,19 +208,19 @@ sql.append(SQLUtil.getCreateTableColumnsClause( cmrField.getRelatedCMRField().getTableKeyFields())); -// // add a pk constraint -// if(cmrField.hasPrimaryKeyConstraint()) { -// sql.append(", CONSTRAINT pk").append( -// cmrField.getRelationTableName()); -// -// sql.append(" PRIMARY KEY ("); -// sql.append(SQLUtil.getColumnNamesClause( -// cmrField.getTableKeyFields()))); -// sql.append(", "); -// sql.append(SQLUtil.getColumnNamesClause( -// cmrField.getRelatedCMRField().getTableKeyFields())); -// sql.append(")"); -// } + // add a pk constraint + if(cmrField.getRelationMetaData().hasPrimaryKeyConstraint()) { + sql.append(", CONSTRAINT pk").append( + cmrField.getRelationMetaData().getTableName()); + + sql.append(" PRIMARY KEY ("); + sql.append(SQLUtil.getColumnNamesClause( + cmrField.getTableKeyFields())); + sql.append(", "); + sql.append(SQLUtil.getColumnNamesClause( + cmrField.getRelatedCMRField().getTableKeyFields())); + sql.append(")"); + } sql.append(")"); return sql.toString();
_______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-development