From 74e6281a02dfd8c0d4bcf4a1b9a9e62223c16e4b Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Sat, 11 Oct 2014 11:44:46 +0900
Subject: [PATCH] Allow the Javassist proxy generator to generate these
 delegate methods.

---
 .../hikari/proxy/PreparedStatementProxy.java  | 13 -------
 .../zaxxer/hikari/proxy/StatementProxy.java   | 37 -------------------
 .../hikari/proxy/PreparedStatementProxy.java  | 11 ------
 .../zaxxer/hikari/proxy/StatementProxy.java   | 36 ------------------
 4 files changed, 97 deletions(-)

diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java
index 7d3cfa08..0112f169 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java
@@ -17,8 +17,6 @@
 package com.zaxxer.hikari.proxy;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 
 /**
  * This is the proxy class for java.sql.PreparedStatement.
@@ -36,15 +34,4 @@ public abstract class PreparedStatementProxy extends StatementProxy implements P
    //              Overridden java.sql.PreparedStatement Methods
    // **********************************************************************
 
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet executeQuery() throws SQLException
-   {
-      try {
-         return ((PreparedStatement) delegate).executeQuery();
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
 }
diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
index 446b7ef1..6b4aa90f 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
@@ -17,7 +17,6 @@
 package com.zaxxer.hikari.proxy;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Wrapper;
@@ -68,42 +67,6 @@ public abstract class StatementProxy implements Statement
       }
    }
 
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet executeQuery(String sql) throws SQLException
-   {
-      try {
-         return delegate.executeQuery(sql);
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
-
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet getResultSet() throws SQLException
-   {
-      try {
-         return delegate.getResultSet();
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
-
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet getGeneratedKeys() throws SQLException
-   {
-      try {
-         return delegate.getGeneratedKeys();
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
-
    /** {@inheritDoc} */
    @Override
    public final Connection getConnection() throws SQLException
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java
index 7d3cfa08..4ccdaa0f 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/PreparedStatementProxy.java
@@ -36,15 +36,4 @@ public abstract class PreparedStatementProxy extends StatementProxy implements P
    //              Overridden java.sql.PreparedStatement Methods
    // **********************************************************************
 
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet executeQuery() throws SQLException
-   {
-      try {
-         return ((PreparedStatement) delegate).executeQuery();
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
 }
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
index 446b7ef1..c0b32745 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/StatementProxy.java
@@ -68,42 +68,6 @@ public abstract class StatementProxy implements Statement
       }
    }
 
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet executeQuery(String sql) throws SQLException
-   {
-      try {
-         return delegate.executeQuery(sql);
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
-
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet getResultSet() throws SQLException
-   {
-      try {
-         return delegate.getResultSet();
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
-
-   /** {@inheritDoc} */
-   @Override
-   public final ResultSet getGeneratedKeys() throws SQLException
-   {
-      try {
-         return delegate.getGeneratedKeys();
-      }
-      catch (SQLException e) {
-         throw connection.checkException(e);
-      }
-   }
-
    /** {@inheritDoc} */
    @Override
    public final Connection getConnection() throws SQLException