From 3fd656a65111428b60a1766ec6c870ad88134924 Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Fri, 30 Jun 2006 16:58:13 +0000
Subject: [PATCH] fix - SQL Report w/ pagination and nested queries (pagination
 is now over-ridden as intended when nested queries are defined)

---
 docs/changelog/7.x.x.txt              | 2 ++
 lib/WebGUI/Asset/Wobject/SQLReport.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 3935d1301..5f23326f9 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -17,3 +17,5 @@
  - fix: Adding Survey Choices
  - fix: User/Group problem
  - fix: Edit LDAP Connection
+ - fix: SQL Report w/ pagination and nested queries
+
diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm
index ed23ec518..b704ac47e 100644
--- a/lib/WebGUI/Asset/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm
@@ -428,7 +428,7 @@ sub _processQuery {
                                 }
                         }
 			my $paginateAfter = $self->get("paginateAfter");
-			$paginateAfter = 1000 if($nr > 1);
+			$paginateAfter = 1000 if($self->{_query}{$nr + 1}{dbQuery});
                         my $p = WebGUI::Paginator->new($self->session,$url,$paginateAfter);
                         my $error = $p->setDataByQuery($query,$dbh,1,$placeholderParams);
                         if ($error ne "") {