User: danch
Date: 02/02/25 09:18:20
Modified: src/main/org/jboss/ejb/plugins/jaws/jdbc Tag: Branch_2_4
JDBCInitCommand.java
Log:
made 'table not created' message error rather than debug
Revision Changes Path
No revision
No revision
1.12.6.6 +182 -172
jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCInitCommand.java
Index: JDBCInitCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/jdbc/JDBCInitCommand.java,v
retrieving revision 1.12.6.5
retrieving revision 1.12.6.6
diff -u -r1.12.6.5 -r1.12.6.6
--- JDBCInitCommand.java 9 Dec 2001 00:46:22 -0000 1.12.6.5
+++ JDBCInitCommand.java 25 Feb 2002 17:18:20 -0000 1.12.6.6
@@ -1,172 +1,182 @@
-/*
- * JBoss, the OpenSource EJB server
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-package org.jboss.ejb.plugins.jaws.jdbc;
-
-import java.util.Iterator;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.DatabaseMetaData;
-
-
-import org.jboss.ejb.plugins.jaws.JPMInitCommand;
-import org.jboss.ejb.plugins.jaws.metadata.CMPFieldMetaData;
-import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
-
-/**
- * JAWSPersistenceManager JDBCInitCommand
- *
- * @see <related>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard Öberg</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
- * @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>
- * @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson</a>
- * @version $Revision: 1.12.6.5 $
- *
- * Revision:
- * 20010621 danch: fixed bug where mapping a PK field to a different column name
- * resulted in an improper PK constraint.
- */
-public class JDBCInitCommand
- extends JDBCUpdateCommand
- implements JPMInitCommand
-{
- // Constructors --------------------------------------------------
-
- public JDBCInitCommand(JDBCCommandFactory factory)
- {
- super(factory, "Init");
-
- // Create table SQL
- String sql = "CREATE TABLE " + jawsEntity.getTableName() + " (";
-
- Iterator it = jawsEntity.getCMPFields();
- boolean first = true;
- while (it.hasNext())
- {
- CMPFieldMetaData cmpField = (CMPFieldMetaData)it.next();
-
- sql += (first ? "" : ",") +
- cmpField.getColumnName() + " " +
- cmpField.getSQLType();
-
-
- first = false;
- }
-
- // If there is a primary key field,
- // and the bean has explicitly <pk-constraint>true</pk-constraint> in jaws.xml
- // add primary key constraint.
- if (jawsEntity.hasPkConstraint()) {
- sql += ",CONSTRAINT pk"+jawsEntity.getTableName()+" PRIMARY KEY (";
- for (Iterator i = jawsEntity.getPkFields();i.hasNext();) {
- String keyCol = ((PkFieldMetaData)i.next()).getColumnName();
- sql += keyCol;
- sql += i.hasNext()?",":"";
- }
- sql +=")";
- }
-
- sql += ")";
-
- setSQL(sql);
- }
-
- // JPMInitCommand implementation ---------------------------------
-
- public void execute() throws Exception
- {
- // Create table if necessary
- if (jawsEntity.getCreateTable())
- {
- // first check if the table already exists...
- // (a j2ee spec compatible jdbc driver has to fully
- // implement the DatabaseMetaData)
- boolean created = false;
- Connection con = null;
- ResultSet rs = null;
- try
- {
- con = getConnection();
- DatabaseMetaData dmd = con.getMetaData();
- rs = dmd.getTables(con.getCatalog(), null, jawsEntity.getTableName(),
null);
- if (rs.next ())
- created = true;
-
- rs.close ();
- con.close ();
- }
- catch(Exception e)
- {
- throw e;
- }
- finally
- {
- if(rs != null) try {rs.close(); rs = null;}catch(SQLException e) {}
- if(con != null) try {con.close();con = null;}catch(SQLException e) {}
- }
-
- // Try to create it
- if(created) {
- log.info("Table '"+jawsEntity.getTableName()+"' already exists");
- } else {
- try
- {
-
- // since we use the pools, we have to do this within a transaction
- factory.getContainer().getTransactionManager().begin ();
- jdbcExecute(null);
- factory.getContainer().getTransactionManager().commit ();
-
- // Create successful, log this
- log.info("Created table '"+jawsEntity.getTableName()+"'
successfully.");
- String pkStr;
- if (jawsEntity.getPrimKeyField() != null)
- pkStr = "'"+jawsEntity.getPrimKeyField()+"'";
- else {
- pkStr = "[";
- for (Iterator i = jawsEntity.getPkFields();i.hasNext();) {
- String keyCol = ((PkFieldMetaData)i.next()).getColumnName();
- pkStr += keyCol;
- pkStr += i.hasNext()?",":"]";
- }
- }
- log.debug("Primary key of table '"+jawsEntity.getTableName()+"' is "
- +pkStr);
- } catch (Exception e)
- {
- log.debug("Could not create table " +
- jawsEntity.getTableName() + ": " + e.getMessage());
- try
- {
- factory.getContainer().getTransactionManager().rollback ();
- }
- catch (Exception _e)
- {
- log.error("Could not roll back transaction: "+ _e.getMessage());
- }
- }
- }
- }
- }
-
- // JDBCUpdateCommand overrides -----------------------------------
-
- protected Object handleResult(int rowsAffected, Object argOrArgs)
- throws Exception
- {
- log.debug("Table " + jawsEntity.getTableName() + " created");
- return null;
- }
-}
-
+/*
+ * JBoss, the OpenSource EJB server
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+package org.jboss.ejb.plugins.jaws.jdbc;
+
+import java.util.Iterator;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.DatabaseMetaData;
+
+
+import org.jboss.ejb.plugins.jaws.JPMInitCommand;
+import org.jboss.ejb.plugins.jaws.metadata.CMPFieldMetaData;
+import org.jboss.ejb.plugins.jaws.metadata.PkFieldMetaData;
+
+/**
+ * JAWSPersistenceManager JDBCInitCommand
+ *
+ * @see <related>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Rickard Öberg</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
+ * @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>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson</a>
+ * @version $Revision: 1.12.6.6 $
+ *
+ * <p><b>Revisions:</b>
+ * <p><b>20010621 danch:</b>
+ * <ul>
+ * <li>fixed bug where mapping a PK field to a different column name
+ * resulted in an improper PK constraint.</li>
+ * </ul>
+ *
+ * <p><b>20020225 danch:</b>
+ * <ul>
+ * <li>'Can't create table' log should be at error level, not debug! This
+ * can result from a problem with the bean itself, and should be made
+ * hard to ignore in order to avoid mistery problems.</li>
+ * </ul>
+ */
+public class JDBCInitCommand
+ extends JDBCUpdateCommand
+ implements JPMInitCommand
+{
+ // Constructors --------------------------------------------------
+
+ public JDBCInitCommand(JDBCCommandFactory factory)
+ {
+ super(factory, "Init");
+
+ // Create table SQL
+ String sql = "CREATE TABLE " + jawsEntity.getTableName() + " (";
+
+ Iterator it = jawsEntity.getCMPFields();
+ boolean first = true;
+ while (it.hasNext())
+ {
+ CMPFieldMetaData cmpField = (CMPFieldMetaData)it.next();
+
+ sql += (first ? "" : ",") +
+ cmpField.getColumnName() + " " +
+ cmpField.getSQLType();
+
+
+ first = false;
+ }
+
+ // If there is a primary key field,
+ // and the bean has explicitly <pk-constraint>true</pk-constraint> in jaws.xml
+ // add primary key constraint.
+ if (jawsEntity.hasPkConstraint()) {
+ sql += ",CONSTRAINT pk"+jawsEntity.getTableName()+" PRIMARY KEY (";
+ for (Iterator i = jawsEntity.getPkFields();i.hasNext();) {
+ String keyCol = ((PkFieldMetaData)i.next()).getColumnName();
+ sql += keyCol;
+ sql += i.hasNext()?",":"";
+ }
+ sql +=")";
+ }
+
+ sql += ")";
+
+ setSQL(sql);
+ }
+
+ // JPMInitCommand implementation ---------------------------------
+
+ public void execute() throws Exception
+ {
+ // Create table if necessary
+ if (jawsEntity.getCreateTable())
+ {
+ // first check if the table already exists...
+ // (a j2ee spec compatible jdbc driver has to fully
+ // implement the DatabaseMetaData)
+ boolean created = false;
+ Connection con = null;
+ ResultSet rs = null;
+ try
+ {
+ con = getConnection();
+ DatabaseMetaData dmd = con.getMetaData();
+ rs = dmd.getTables(con.getCatalog(), null, jawsEntity.getTableName(),
null);
+ if (rs.next ())
+ created = true;
+
+ rs.close ();
+ con.close ();
+ }
+ catch(Exception e)
+ {
+ throw e;
+ }
+ finally
+ {
+ if(rs != null) try {rs.close(); rs = null;}catch(SQLException e) {}
+ if(con != null) try {con.close();con = null;}catch(SQLException e) {}
+ }
+
+ // Try to create it
+ if(created) {
+ log.info("Table '"+jawsEntity.getTableName()+"' already exists");
+ } else {
+ try
+ {
+
+ // since we use the pools, we have to do this within a transaction
+ factory.getContainer().getTransactionManager().begin ();
+ jdbcExecute(null);
+ factory.getContainer().getTransactionManager().commit ();
+
+ // Create successful, log this
+ log.info("Created table '"+jawsEntity.getTableName()+"'
successfully.");
+ String pkStr;
+ if (jawsEntity.getPrimKeyField() != null)
+ pkStr = "'"+jawsEntity.getPrimKeyField()+"'";
+ else {
+ pkStr = "[";
+ for (Iterator i = jawsEntity.getPkFields();i.hasNext();) {
+ String keyCol = ((PkFieldMetaData)i.next()).getColumnName();
+ pkStr += keyCol;
+ pkStr += i.hasNext()?",":"]";
+ }
+ }
+ log.debug("Primary key of table '"+jawsEntity.getTableName()+"' is "
+ +pkStr);
+ } catch (Exception e)
+ {
+ log.error("Could not create table " +
+ jawsEntity.getTableName() + ": " + e.getMessage());
+ try
+ {
+ factory.getContainer().getTransactionManager().rollback ();
+ }
+ catch (Exception _e)
+ {
+ log.error("Could not roll back transaction: "+ _e.getMessage());
+ }
+ }
+ }
+ }
+ }
+
+ // JDBCUpdateCommand overrides -----------------------------------
+
+ protected Object handleResult(int rowsAffected, Object argOrArgs)
+ throws Exception
+ {
+ log.debug("Table " + jawsEntity.getTableName() + " created");
+ return null;
+ }
+}
+
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
