From eaf50d8b5799a8d43f9f8d2b1cc2b0fd4d33b4ed Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Wed, 19 Sep 2012 16:02:06 +0200
Subject: [PATCH] [#1829] Factory.execute(String) may cause errors when plain
 SQL returns results

---
 .../src/org/jooq/test/_/testcases/PlainSQLTests.java     | 9 +++++++++
 jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java        | 5 +++++
 jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java      | 8 +++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
index 73458e2acc..b573551d1c 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java
@@ -121,6 +121,15 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658,
         assertEquals(BOOK_TITLES, result.getValues(1));
     }
 
+    @Test
+    public void testPlainSQLExecuteWithResults() throws Exception {
+        // [#1829] The Factory.execute() method must be able to handle queries
+        // that return results
+
+        assertEquals(0, create().execute(create().render(create().selectOne())));
+        assertEquals(0, create().query(create().render(create().selectOne())).execute());
+    }
+
     @Test
     public void testPlainSQL() throws Exception {
         jOOQAbstractTest.reset = false;
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 82261d70a3..49a5543389 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -884,6 +884,11 @@ public abstract class jOOQAbstractTest<
         new PlainSQLTests(this).testPlainSQL();
     }
 
+    @Test
+    public void testPlainSQLExecuteWithResults() throws Exception {
+        new PlainSQLTests(this).testPlainSQLExecuteWithResults();
+    }
+
     @Test
     public void testPlainSQLAndComments() throws Exception {
         new PlainSQLTests(this).testPlainSQLAndComments();
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
index 176a0519ae..66c32c16be 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java
@@ -214,11 +214,13 @@ abstract class AbstractQuery extends AbstractQueryPart implements Query, Attacha
      */
     protected int execute(ExecuteContext ctx, ExecuteListener listener) throws SQLException {
         int result = 0;
-
         listener.executeStart(ctx);
-        result = ctx.statement().executeUpdate();
-        listener.executeEnd(ctx);
 
+        if (!ctx.statement().execute()) {
+            result = ctx.statement().getUpdateCount();
+        }
+
+        listener.executeEnd(ctx);
         return result;
     }