r12998 - in /branches/upstream/libdbix-searchbuilder-perl/current: Changes META.yml SIGNATURE SearchBuilder.pm
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Fri Jan 18 22:09:39 UTC 2008
Author: gregoa-guest
Date: Fri Jan 18 22:09:39 2008
New Revision: 12998
URL: http://svn.debian.org/wsvn/?sc=1&rev=12998
Log:
[svn-upgrade] Integrating new upstream version, libdbix-searchbuilder-perl (1.51)
Modified:
branches/upstream/libdbix-searchbuilder-perl/current/Changes
branches/upstream/libdbix-searchbuilder-perl/current/META.yml
branches/upstream/libdbix-searchbuilder-perl/current/SIGNATURE
branches/upstream/libdbix-searchbuilder-perl/current/SearchBuilder.pm
Modified: branches/upstream/libdbix-searchbuilder-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libdbix-searchbuilder-perl/current/Changes?rev=12998&op=diff
==============================================================================
--- branches/upstream/libdbix-searchbuilder-perl/current/Changes (original)
+++ branches/upstream/libdbix-searchbuilder-perl/current/Changes Fri Jan 18 22:09:39 2008
@@ -1,4 +1,8 @@
Revision history for Perl extension DBIx::SearchBuilder.
+
+1.51 Tue Jan 15 22:53:56 UTC 2008
+
+* Fix CountAll method when paging is enabled and data is in memory already
1.50 Fri Nov 23 23:24:00 UTC 2007
Modified: branches/upstream/libdbix-searchbuilder-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libdbix-searchbuilder-perl/current/META.yml?rev=12998&op=diff
==============================================================================
--- branches/upstream/libdbix-searchbuilder-perl/current/META.yml (original)
+++ branches/upstream/libdbix-searchbuilder-perl/current/META.yml Fri Jan 18 22:09:39 2008
@@ -26,4 +26,4 @@
DBI: 0
Encode: 0
Want: 0
-version: 1.50
+version: 1.51
Modified: branches/upstream/libdbix-searchbuilder-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/branches/upstream/libdbix-searchbuilder-perl/current/SIGNATURE?rev=12998&op=diff
==============================================================================
--- branches/upstream/libdbix-searchbuilder-perl/current/SIGNATURE (original)
+++ branches/upstream/libdbix-searchbuilder-perl/current/SIGNATURE Fri Jan 18 22:09:39 2008
@@ -14,13 +14,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-SHA1 8cfb706cb36b3d211fa3f6ae2beaa15d56da4646 Changes
+SHA1 078309de7827fa2b031323b77a2e68d009812262 Changes
SHA1 2e9746a7afda5167d8c7ff25a88f345ea5e35a02 MANIFEST
-SHA1 e6d8b0c25bd23171b54dc522f1c11e32ad336ff9 META.yml
+SHA1 d622eefd4e7d29bb55e21ff83f4e25392f9a86b9 META.yml
SHA1 837637cca03f08e799c2106fedbf547f79e6feb7 Makefile.PL
SHA1 d7a41642c368f2a587587e09f9e815d434feebff README
SHA1 5a53d12d5cccd94845a6a7cc105cd9be34e20f1c ROADMAP
-SHA1 ae5db7c174780d9b9a8483623d5649c2c1f94706 SearchBuilder.pm
+SHA1 f33b152cae6712e230e5527f411e6a53e1438727 SearchBuilder.pm
SHA1 0777214c051789d8a42951997e897b7bd49510ce SearchBuilder/Handle.pm
SHA1 55d337e6dd1ab5aecc39d2ae491bffb12e9ca449 SearchBuilder/Handle/Informix.pm
SHA1 4efdcaefa5f94d994b052d1b343d2f5164ef4b52 SearchBuilder/Handle/ODBC.pm
@@ -63,9 +63,9 @@
SHA1 afd320ea000cbe83b08691cc37bea45da20002d3 t/testmodels.pl
SHA1 50bd534c8ee459d9e28fd51843dd1ad70fd5c9b1 t/utils.pl
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.8 (GNU/Linux)
-iD8DBQFHR2EFvH6dkeDZaS8RAsbuAJ4qbOT54rG1H0JVnQmdd/i15xs2gwCfVzFW
-mTeEHswHZX+z42Ak3Dgk62A=
-=8D0G
+iEYEARECAAYFAkeNOoAACgkQvH6dkeDZaS9Z9gCfcwhrP8q9iadvARoTgVjZM7gH
+KakAn29tFAycAYq22e3GmE1x9+mAyHhN
+=wBHs
-----END PGP SIGNATURE-----
Modified: branches/upstream/libdbix-searchbuilder-perl/current/SearchBuilder.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libdbix-searchbuilder-perl/current/SearchBuilder.pm?rev=12998&op=diff
==============================================================================
--- branches/upstream/libdbix-searchbuilder-perl/current/SearchBuilder.pm (original)
+++ branches/upstream/libdbix-searchbuilder-perl/current/SearchBuilder.pm Fri Jan 18 22:09:39 2008
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = "1.50";
+our $VERSION = "1.51";
use Clone qw();
use Encode qw();
@@ -1427,11 +1427,17 @@
# If we haven't actually got all objects loaded in memory, we
# really just want to do a quick count from the database.
- if ( $self->{'must_redo_search'} || !$self->{'count_all'}) {
+ # or if we have paging enabled then we count as well and store it in count_all
+ if ( $self->{'must_redo_search'} || ( $self->RowsPerPage && !$self->{'count_all'} ) ) {
# If we haven't already asked the database for the row count, do that
- $self->_DoCount(1) unless ( $self->{'count_all'} );
+ $self->_DoCount(1);
#Report back the raw # of rows in the database
+ return ( $self->{'count_all'} );
+ }
+
+ # if we have paging enabled and have count_all then return it
+ elsif ( $self->RowsPerPage ) {
return ( $self->{'count_all'} );
}
More information about the Pkg-perl-cvs-commits
mailing list