From 267ba0faa9bc0deff7fdf6ec2ba0c42f6bfcf6d6 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 28 Oct 2013 17:56:03 +0100
Subject: [PATCH] [#2811] Deprecate ResultQuery.fetchLazy(int) - fetchSize is
 now passed to ResultQuery.fetchSize() not only for lazy fetching

---
 jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java   | 6 +++---
 jOOQ/src/main/java/org/jooq/ResultQuery.java              | 3 +++
 jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java | 1 +
 jOOQ/src/main/java/org/jooq/impl/SelectImpl.java          | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
index 5d96b59ceb..475317e004 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java
@@ -1638,7 +1638,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             // ---------------------------------------------------------------------
             // A regular pass through the cursor
             // ---------------------------------------------------------------------
-            Cursor<B> cursor = create().selectFrom(TBook()).orderBy(TBook_ID()).fetchLazy(fetchSize);
+            Cursor<B> cursor = create().selectFrom(TBook()).orderBy(TBook_ID()).fetchSize(fetchSize).fetchLazy();
 
             assertTrue(cursor.hasNext());
             assertTrue(cursor.hasNext());
@@ -1680,7 +1680,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             // ---------------------------------------------------------------------
             // Prematurely closing the cursor
             // ---------------------------------------------------------------------
-            cursor = create().selectFrom(TBook()).orderBy(TBook_ID()).fetchLazy(fetchSize);
+            cursor = create().selectFrom(TBook()).orderBy(TBook_ID()).fetchSize(fetchSize).fetchLazy();
 
             assertTrue(cursor.hasNext());
             assertTrue(cursor.hasNext());
@@ -1696,7 +1696,7 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
             // ---------------------------------------------------------------------
             // Fetching several records at once
             // ---------------------------------------------------------------------
-            cursor = create().selectFrom(TBook()).orderBy(TBook_ID()).fetchLazy(fetchSize);
+            cursor = create().selectFrom(TBook()).orderBy(TBook_ID()).fetchSize(fetchSize).fetchLazy();
             Result<B> fetch0 = cursor.fetch(0);
 
             assertTrue(fetch0.isEmpty());
diff --git a/jOOQ/src/main/java/org/jooq/ResultQuery.java b/jOOQ/src/main/java/org/jooq/ResultQuery.java
index 31b414b649..c403412ef4 100644
--- a/jOOQ/src/main/java/org/jooq/ResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/ResultQuery.java
@@ -156,7 +156,10 @@ public interface ResultQuery<R extends Record> extends Query {
      * @throws DataAccessException if something went wrong executing the query
      * @see #fetchLazy()
      * @see Statement#setFetchSize(int)
+     * @deprecated - [#2811] - 3.3.0 - Use {@link #fetchSize(int)} and
+     *             {@link #fetchLazy()} instead.
      */
+    @Deprecated
     Cursor<R> fetchLazy(int fetchSize) throws DataAccessException;
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index b3a064b3b9..41be55c2e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@@ -342,6 +342,7 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
     }
 
     @Override
+    @Deprecated
     public final Cursor<R> fetchLazy(int size) {
         lazy = true;
         fetchSize = size;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index c571514383..7f4eb30163 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -1689,6 +1689,7 @@ class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
     }
 
     @Override
+    @Deprecated
     public final Cursor<R> fetchLazy(int fetchSize) {
         return getDelegate().fetchLazy(fetchSize);
     }