r9934 - in /trunk/libdbix-searchbuilder-perl: ./ SearchBuilder/ SearchBuilder/Handle/ debian/ inc/Module/ inc/Module/Install/

ntyni-guest at users.alioth.debian.org ntyni-guest at users.alioth.debian.org
Wed Nov 28 19:07:36 UTC 2007


Author: ntyni-guest
Date: Wed Nov 28 19:07:36 2007
New Revision: 9934

URL: http://svn.debian.org/wsvn/?sc=1&rev=9934
Log:
* New upstream release.

Modified:
    trunk/libdbix-searchbuilder-perl/Changes
    trunk/libdbix-searchbuilder-perl/META.yml
    trunk/libdbix-searchbuilder-perl/Makefile.PL
    trunk/libdbix-searchbuilder-perl/SIGNATURE
    trunk/libdbix-searchbuilder-perl/SearchBuilder.pm
    trunk/libdbix-searchbuilder-perl/SearchBuilder/Handle/Oracle.pm
    trunk/libdbix-searchbuilder-perl/SearchBuilder/Record.pm
    trunk/libdbix-searchbuilder-perl/SearchBuilder/Union.pm
    trunk/libdbix-searchbuilder-perl/debian/changelog
    trunk/libdbix-searchbuilder-perl/inc/Module/Install.pm
    trunk/libdbix-searchbuilder-perl/inc/Module/Install/AutoInstall.pm
    trunk/libdbix-searchbuilder-perl/inc/Module/Install/Base.pm
    trunk/libdbix-searchbuilder-perl/inc/Module/Install/Include.pm
    trunk/libdbix-searchbuilder-perl/inc/Module/Install/Makefile.pm
    trunk/libdbix-searchbuilder-perl/inc/Module/Install/Metadata.pm

Modified: trunk/libdbix-searchbuilder-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/Changes?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/Changes (original)
+++ trunk/libdbix-searchbuilder-perl/Changes Wed Nov 28 19:07:36 2007
@@ -1,4 +1,10 @@
 Revision history for Perl extension DBIx::SearchBuilder.
+
+1.50 Fri Nov 23 23:24:00 UTC 2007
+
+* Oracle: Don't DISTINCT query when there is a group by cluse
+* Fix a problem when we have more then two collections in a union
+  and some of them are empty
 
 1.49 Sat Jul  7 18:45:41 EDT 2007
 

Modified: trunk/libdbix-searchbuilder-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/META.yml?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/META.yml (original)
+++ trunk/libdbix-searchbuilder-perl/META.yml Wed Nov 28 19:07:36 2007
@@ -1,10 +1,13 @@
 --- 
+abstract: Encapsulate SQL queries and rows in simple perl objects
+author: 
+  - Jesse Vincent <jesse at bestpractical.com>
 build_requires: 
   DBD::SQLite: 0
   File::Temp: 0
   Test::More: 0.52
 distribution_type: module
-generated_by: Module::Install version 0.67
+generated_by: Module::Install version 0.68
 license: perl
 meta-spec: 
   url: http://module-build.sourceforge.net/META-spec-v1.3.html
@@ -23,4 +26,4 @@
   DBI: 0
   Encode: 0
   Want: 0
-version: 1.49
+version: 1.50

Modified: trunk/libdbix-searchbuilder-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/Makefile.PL?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/Makefile.PL (original)
+++ trunk/libdbix-searchbuilder-perl/Makefile.PL Wed Nov 28 19:07:36 2007
@@ -2,7 +2,8 @@
 
 name ('DBIx-SearchBuilder');
 license ('perl');
-version_from('SearchBuilder.pm');
+author ('Jesse Vincent <jesse at bestpractical.com>');
+all_from('SearchBuilder.pm');
 requires('DBI');
 requires('Want');
 requires('Encode');

Modified: trunk/libdbix-searchbuilder-perl/SIGNATURE
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/SIGNATURE?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/SIGNATURE (original)
+++ trunk/libdbix-searchbuilder-perl/SIGNATURE Wed Nov 28 19:07:36 2007
@@ -14,37 +14,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 7f92930618cf0faa0b5a503be7e66f8d87527c0b Changes
+SHA1 8cfb706cb36b3d211fa3f6ae2beaa15d56da4646 Changes
 SHA1 2e9746a7afda5167d8c7ff25a88f345ea5e35a02 MANIFEST
-SHA1 61d5fb7ba86d8afb17b4db523621da09c40c7973 META.yml
-SHA1 9caac7d42ee2e69b1768c238bd199b260756a0e6 Makefile.PL
+SHA1 e6d8b0c25bd23171b54dc522f1c11e32ad336ff9 META.yml
+SHA1 837637cca03f08e799c2106fedbf547f79e6feb7 Makefile.PL
 SHA1 d7a41642c368f2a587587e09f9e815d434feebff README
 SHA1 5a53d12d5cccd94845a6a7cc105cd9be34e20f1c ROADMAP
-SHA1 3a75b15d8683426a543af789abe5336ffa208331 SearchBuilder.pm
+SHA1 ae5db7c174780d9b9a8483623d5649c2c1f94706 SearchBuilder.pm
 SHA1 0777214c051789d8a42951997e897b7bd49510ce SearchBuilder/Handle.pm
 SHA1 55d337e6dd1ab5aecc39d2ae491bffb12e9ca449 SearchBuilder/Handle/Informix.pm
 SHA1 4efdcaefa5f94d994b052d1b343d2f5164ef4b52 SearchBuilder/Handle/ODBC.pm
-SHA1 5e3af079baf4651c464fca8e168c52eb8f130c30 SearchBuilder/Handle/Oracle.pm
+SHA1 061fabc379cda40e6c6e79b9779829f399ed6494 SearchBuilder/Handle/Oracle.pm
 SHA1 4e096c7cf4583c2ab01a5a893741bf1f26cf48a4 SearchBuilder/Handle/Pg.pm
 SHA1 ecb52a19979aea9528fc690028d16a05ab356c13 SearchBuilder/Handle/SQLite.pm
 SHA1 ec3fbc03b27c008d93a52b6b7fb0076529e5fcc8 SearchBuilder/Handle/Sybase.pm
 SHA1 ea451e77f452b7739fccb2af4301b70866c6cf19 SearchBuilder/Handle/mysql.pm
 SHA1 877685aaff265e36fa37298c372aa56864f68aa5 SearchBuilder/Handle/mysqlPP.pm
-SHA1 e83d5f379f845d69117bb1b255b8cb14ec38e2cd SearchBuilder/Record.pm
+SHA1 5dd029a91e72614d7aaf201b277a668c540e7dff SearchBuilder/Record.pm
 SHA1 1680fe8c21ca1667c55501c5f0e9b7bef434647f SearchBuilder/Record/Cachable.pm
 SHA1 a15065e472797e2bfe8149f04d3bdc58f67a7a6d SearchBuilder/SchemaGenerator.pm
-SHA1 772cc5877b1575823a404222ffb028b176177661 SearchBuilder/Union.pm
+SHA1 f59ad14464f1520aa4f9dacdf437047081a94741 SearchBuilder/Union.pm
 SHA1 1eb4e838ff1d8d927bfe177bf578df246802b03d SearchBuilder/Unique.pm
 SHA1 e7c7c7c91025072d25da78c93cefa2bc0aaf2b35 ex/Example/Model/Address.pm
 SHA1 f821661849153c21ad99393b6a3ea6720fdaf581 ex/Example/Model/Employee.pm
 SHA1 9689368197327e7b38af7f3d1f863e918ed4fa98 ex/create_tables.pl
 SHA1 603bb9de29fb8cba7f13409c546750972eff645d inc/Module/AutoInstall.pm
-SHA1 78edb89a439463e44c33a72bbee84c54d0dc8aaf inc/Module/Install.pm
-SHA1 ae32c02b539901de91f06366ce9bdbb7a7bd040b inc/Module/Install/AutoInstall.pm
-SHA1 8ea4e37df83fd0c1c050be5c8da75545c3828d9b inc/Module/Install/Base.pm
-SHA1 6bf0d0d100b94d1a2ce64d010c8813dec26ac480 inc/Module/Install/Include.pm
-SHA1 2054450e1e9c1dd8056362bf4a64ae70d5d71476 inc/Module/Install/Makefile.pm
-SHA1 5d6189b2cad15cf9932a28faafd55130c8247e83 inc/Module/Install/Metadata.pm
+SHA1 7e2cfa1b9efe0d502ee57717649c90ba4bd28ba9 inc/Module/Install.pm
+SHA1 182a0df45b65151afdc2be0b7246a2d02d0f0567 inc/Module/Install/AutoInstall.pm
+SHA1 6e1392d80a0f239eecd5664f7f21f922cedb9329 inc/Module/Install/Base.pm
+SHA1 4933b00c3a646da8d223c6957f94552bbd62f8c6 inc/Module/Install/Include.pm
+SHA1 54fcbed19232ec959bb17cfb4410599afc7f0779 inc/Module/Install/Makefile.pm
+SHA1 7d3be9b158e37b2b2c22084740099955623b1d56 inc/Module/Install/Metadata.pm
 SHA1 e59ea21b9407644714a5f67c7132a11916c25133 t/00.load.t
 SHA1 a7ed1ee359ebe2842b354b5652a441403e802080 t/01basics.t
 SHA1 2b2dc6f72370f60e1d233f2f8c12bb87414e825c t/01nocap_api.t
@@ -63,9 +63,9 @@
 SHA1 afd320ea000cbe83b08691cc37bea45da20002d3 t/testmodels.pl
 SHA1 50bd534c8ee459d9e28fd51843dd1ad70fd5c9b1 t/utils.pl
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (Darwin)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGkBf2Ei9d9xCOQEYRAklJAJ95tcXfOc6IFaKoNQW9cos0s36u3wCguaUU
-ypSNFRuSemtNhEXbHQacPPA=
-=RsYX
+iD8DBQFHR2EFvH6dkeDZaS8RAsbuAJ4qbOT54rG1H0JVnQmdd/i15xs2gwCfVzFW
+mTeEHswHZX+z42Ak3Dgk62A=
+=8D0G
 -----END PGP SIGNATURE-----

Modified: trunk/libdbix-searchbuilder-perl/SearchBuilder.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/SearchBuilder.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/SearchBuilder.pm (original)
+++ trunk/libdbix-searchbuilder-perl/SearchBuilder.pm Wed Nov 28 19:07:36 2007
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = "1.49";
+our $VERSION = "1.50";
 
 use Clone qw();
 use Encode qw();

Modified: trunk/libdbix-searchbuilder-perl/SearchBuilder/Handle/Oracle.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/SearchBuilder/Handle/Oracle.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/SearchBuilder/Handle/Oracle.pm (original)
+++ trunk/libdbix-searchbuilder-perl/SearchBuilder/Handle/Oracle.pm Wed Nov 28 19:07:36 2007
@@ -245,6 +245,17 @@
     my $self = shift;
     my $statementref = shift;
     my $sb = shift;
+
+    # when we have group by clause then the result set is distinct as
+    # it must contain only columns we group by or results of aggregate
+    # functions which give one result per group, so we can skip DISTINCTing
+    if ( my $group = $sb->_GroupClause ) {
+        $$statementref = "SELECT main.* FROM $$statementref";
+        $$statementref .= $group;
+        $$statementref .= $sb->_OrderClause;
+        return;
+    }
+
     my $table = $sb->Table;
 
     # Wrapp select query in a subselect as Oracle doesn't allow

Modified: trunk/libdbix-searchbuilder-perl/SearchBuilder/Record.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/SearchBuilder/Record.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/SearchBuilder/Record.pm (original)
+++ trunk/libdbix-searchbuilder-perl/SearchBuilder/Record.pm Wed Nov 28 19:07:36 2007
@@ -386,8 +386,7 @@
 
 sub Id  {
     my $pkey = $_[0]->_PrimaryKey();
-    my $ret = $_[0]->{'values'}->{$pkey};
-    return $ret;
+    return $_[0]->{'values'}->{ $pkey };
 }
 
 

Modified: trunk/libdbix-searchbuilder-perl/SearchBuilder/Union.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/SearchBuilder/Union.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/SearchBuilder/Union.pm (original)
+++ trunk/libdbix-searchbuilder-perl/SearchBuilder/Union.pm Wed Nov 28 19:07:36 2007
@@ -103,22 +103,22 @@
 =cut
 
 sub Next {
-  my $self=shift;
-
-  return undef unless defined  $self->{data}[ $self->{curp} ];
-    
-  my $cur =  $self->{data}[ $self->{curp} ];
-  # do the search to avoid the count query and the search
-  $cur->_DoSearch if $cur->{'must_redo_search'};
-  if ( $cur->_ItemsCounter == $cur->Count ) {
-	# move to the next element
-	$self->{curp}++;
-	return undef unless defined   $self->{data}[ $self->{curp} ];
-	$cur =  $self->{data}[ $self->{curp} ];
-	$self->{data}[ $self->{curp} ]->GotoFirstItem;
-  }
-  $self->{item}++;
-  $cur->Next;
+    my $self=shift;
+
+    my $goto_first = 0;
+    while ( my $cur = $self->{'data'}[ $self->{'curp'} ] ) {
+        $cur->GotoFirstItem if $goto_first;
+
+        my $res = $cur->Next;
+        if ( $res ) {
+            $self->{'item'}++;
+            return $res;
+        }
+
+        $goto_first = 1;
+        $self->{'curp'}++;
+    }
+    return undef;
 }
 
 =head2 Last

Modified: trunk/libdbix-searchbuilder-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/debian/changelog?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/debian/changelog (original)
+++ trunk/libdbix-searchbuilder-perl/debian/changelog Wed Nov 28 19:07:36 2007
@@ -1,10 +1,14 @@
-libdbix-searchbuilder-perl (1.49-2) UNRELEASED; urgency=low
-
+libdbix-searchbuilder-perl (1.50-1) UNRELEASED; urgency=low
+
+  [ gregor herrmann ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
 
- -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:28:54 +0200
+  [ Niko Tyni ]
+  * New upstream release.
+
+ -- Niko Tyni <ntyni at iki.fi>  Wed, 28 Nov 2007 20:30:30 +0200
 
 libdbix-searchbuilder-perl (1.49-1) unstable; urgency=low
 

Modified: trunk/libdbix-searchbuilder-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/inc/Module/Install.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/inc/Module/Install.pm (original)
+++ trunk/libdbix-searchbuilder-perl/inc/Module/Install.pm Wed Nov 28 19:07:36 2007
@@ -28,7 +28,7 @@
     # This is not enforced yet, but will be some time in the next few
     # releases once we can make sure it won't clash with custom
     # Module::Install extensions.
-    $VERSION = '0.67';
+    $VERSION = '0.68';
 }
 
 # Whether or not inc::Module::Install is actually loaded, the

Modified: trunk/libdbix-searchbuilder-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/inc/Module/Install/AutoInstall.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libdbix-searchbuilder-perl/inc/Module/Install/AutoInstall.pm Wed Nov 28 19:07:36 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.67';
+	$VERSION = '0.68';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: trunk/libdbix-searchbuilder-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/inc/Module/Install/Base.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libdbix-searchbuilder-perl/inc/Module/Install/Base.pm Wed Nov 28 19:07:36 2007
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.67';
+$VERSION = '0.68';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: trunk/libdbix-searchbuilder-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/inc/Module/Install/Include.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libdbix-searchbuilder-perl/inc/Module/Install/Include.pm Wed Nov 28 19:07:36 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.67';
+	$VERSION = '0.68';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: trunk/libdbix-searchbuilder-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/inc/Module/Install/Makefile.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libdbix-searchbuilder-perl/inc/Module/Install/Makefile.pm Wed Nov 28 19:07:36 2007
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.67';
+	$VERSION = '0.68';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: trunk/libdbix-searchbuilder-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/trunk/libdbix-searchbuilder-perl/inc/Module/Install/Metadata.pm?rev=9934&op=diff
==============================================================================
--- trunk/libdbix-searchbuilder-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libdbix-searchbuilder-perl/inc/Module/Install/Metadata.pm Wed Nov 28 19:07:36 2007
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.67';
+	$VERSION = '0.68';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }




More information about the Pkg-perl-cvs-commits mailing list