[Hyperic-hq-discuss] hq r7283 - trunk/src/org/hyperic/util/jdbc

[<tk...@hy...>]

Author: tkeeney
Date: 2007-12-17 22:49:01 -0800 (Mon, 17 Dec 2007)
New Revision: 7283
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7283

Modified:
   trunk/src/org/hyperic/util/jdbc/DBUtil.java
Log:
[HHQ-1411] Use the dialect-specific SQL to see if the table exists. Doing select * on the table with the same connection as that used by the schema specific task causes a deadlock on postgres.

Modified: trunk/src/org/hyperic/util/jdbc/DBUtil.java
===================================================================
--- trunk/src/org/hyperic/util/jdbc/DBUtil.java	2007-12-18 03:44:53 UTC (rev 7282)
+++ trunk/src/org/hyperic/util/jdbc/DBUtil.java	2007-12-18 06:49:01 UTC (rev 7283)
@@ -42,6 +42,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hyperic.hibernate.dialect.HQDialect;
+import org.hyperic.hibernate.dialect.HibernateUtil;
 import org.hyperic.util.pager.PageControl;
 
 public class DBUtil {
@@ -484,79 +486,21 @@
     public static boolean checkTableExists(Connection conn, String table)
         throws SQLException {
 
-        int dbtype = getDBType(conn);
-        switch (dbtype) {
-            case DATABASE_ORACLE_8:
-            case DATABASE_ORACLE_9:
-            case DATABASE_ORACLE_10:
-                return checkTableExistsOracle(conn, table);
-            case DATABASE_POSTGRESQL_7:
-            case DATABASE_POSTGRESQL_8:
-                return checkTableExistsPostgresql(conn, table);
-            case DATABASE_MYSQL5:
-                return checkTableExistsMySQL(conn, table);
-            default:
-                return false;
-        }
-    }
+        HQDialect dialect = HibernateUtil.getHQDialect(conn);
 
-    private static boolean checkTableExistsOracle(Connection conn,
-                                                  String table)
-        throws SQLException
-    {
-        PreparedStatement ps = null;
-        ResultSet rs = null;
+        Statement stmt = null;
+        boolean exists = false;
+        
         try {
-            ps = conn.prepareStatement("SELECT COUNT(*) FROM " + table);
-            rs = ps.executeQuery();
-            return true;
-        } catch (SQLException e) {
-            if (e.getErrorCode() == 942) return false;
-            throw e;
+            stmt = conn.createStatement();            
+            exists = dialect.tableExists(stmt, table);
         } finally {
-            DBUtil.closeJDBCObjects(log, null, ps, rs);
+            DBUtil.closeStatement(log, stmt);
         }
+        
+        return exists;
     }
 
-    private static boolean checkTableExistsPostgresql(Connection conn,
-                                                      String table)
-        throws SQLException
-    {
-        PreparedStatement ps = null;
-        ResultSet rs = null;
-        try {
-            ps = conn.prepareStatement("SELECT * FROM " + table +
-                                       " LIMIT 1");
-            rs = ps.executeQuery();
-            return true;
-        } catch (SQLException e) {
-            // No error code given on PGSQL, assume any error means that the
-            // table is not a
-            return false;
-        } finally {
-            DBUtil.closeJDBCObjects(log, null, ps, rs);
-        }
-    }
-
-    private static boolean checkTableExistsMySQL(Connection conn,
-                                                 String table)
-        throws SQLException
-    {
-        PreparedStatement ps = null;
-        ResultSet rs = null;
-        try {
-            ps = conn.prepareStatement("SELECT * FROM " + table +
-                                       " LIMIT 1");
-            rs = ps.executeQuery();
-            return true;
-        } catch (SQLException e) {
-            if (e.getErrorCode() == 1146) return false;
-            throw e;
-        } finally {
-            DBUtil.closeJDBCObjects(log, null, ps, rs);
-        }
-    }
-    
     /**
      * Creates a string that consists of the clause repeated a number
      * (iterations) of times, joined by the conjunction string