Update to 1.66

PR:		193472
Submitted by:	michelle@sorbs.net (maintainer)

4 files changed, 9 insertions, 50 deletions

diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 31b151cf0bfd..4b70ef55fb85 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	DBIx-SearchBuilder
-PORTVERSION=	1.65
-PORTREVISION=	1
+PORTVERSION=	1.66
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -26,4 +25,8 @@ TEST_DEPENDS=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
 USES=		perl5
 USE_PERL5=	configure
 
+post-patch:
+		${CP} ${WRKSRC}/lib/DBIx/SearchBuilder/Handle/Pg.pm ${WRKSRC}/lib/DBIx/SearchBuilder/Handle/Pg32.pm
+		${REINPLACE_CMD} -e 's/Pg/Pg32/g' ${WRKSRC}/lib/DBIx/SearchBuilder/Handle/Pg32.pm
+
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-SearchBuilder/distinfo b/databases/p5-DBIx-SearchBuilder/distinfo
index 034412ca633d..8b528e5bb870 100644
--- a/databases/p5-DBIx-SearchBuilder/distinfo
+++ b/databases/p5-DBIx-SearchBuilder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (DBIx-SearchBuilder-1.65.tar.gz) = 4b91265f6543031a9a267e10d5c7bc6926f100d19ac1edae36793227419ae349
-SIZE (DBIx-SearchBuilder-1.65.tar.gz) = 115442
+SHA256 (DBIx-SearchBuilder-1.66.tar.gz) = e2703c3f4b38cf232dec48be98aeab6d2dbee077dcf059369b825629c4be702e
+SIZE (DBIx-SearchBuilder-1.66.tar.gz) = 114777
diff --git a/databases/p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1 b/databases/p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1
deleted file mode 100644
index 5d1a4a60f4e2..000000000000
--- a/databases/p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1
+++ /dev/null
@@ -1,46 +0,0 @@
---- lib/DBIx/SearchBuilder/Handle/Pg.pm	2013-07-02 21:12:09.000000000 +0400
-+++ lib/DBIx/SearchBuilder/Handle/Pg.pm	2014-07-08 23:11:22.000000000 +0400
-@@ -235,9 +235,15 @@ sub DistinctQuery {
-     # It's hard to show with tests. Pg's optimizer can choose execution
-     # plan not guaranting order
- 
--    # So if we are ordering by something that is not in 'main', the we GROUP
--    # BY all columns and adjust the ORDER_BY accordingly
--    local $sb->{group_by} = [ map {+{FIELD => $_}} $self->Fields($table) ];
-+    my $groups;
-+    if ($self->DatabaseVersion =~ /^(\d+)\.(\d+)/ and ($1 > 9 or ($1 == 9 and $2 >= 1))) {
-+        # Pg 9.1 supports "SELECT main.foo ... GROUP BY main.id" if id is the primary key
-+        $groups = [ {FIELD => "id"} ];
-+    } else {
-+        # For earlier versions, we have to list out all of the columns
-+        $groups = [ map {+{FIELD => $_}} $self->Fields($table) ];
-+    }
-+    local $sb->{group_by} = $groups;
-     local $sb->{'order_by'} = [
-         map {
-             ($_->{'ALIAS'}||'') ne "main"
---- lib/DBIx/SearchBuilder/Handle.pm	2013-06-06 23:06:18.000000000 +0400
-+++ lib/DBIx/SearchBuilder/Handle.pm	2014-07-08 23:11:22.000000000 +0400
-@@ -1428,18 +1428,19 @@ sub DistinctCount {
- 
- sub Fields {
-     my $self  = shift;
--    my $table = shift;
-+    my $table = lc shift;
- 
--    unless ( keys %FIELDS_IN_TABLE ) {
--        my $sth = $self->dbh->column_info( undef, '', '%', '%' )
-+    unless ( $FIELDS_IN_TABLE{$table} ) {
-+        $FIELDS_IN_TABLE{ $table } = [];
-+        my $sth = $self->dbh->column_info( undef, '', $table, '%' )
-             or return ();
-         my $info = $sth->fetchall_arrayref({});
-         foreach my $e ( @$info ) {
--            push @{ $FIELDS_IN_TABLE{ lc $e->{'TABLE_NAME'} } ||= [] }, lc $e->{'COLUMN_NAME'};
-+            push @{ $FIELDS_IN_TABLE{ $table } }, lc $e->{'COLUMN_NAME'};
-         }
-     }
- 
--    return @{ $FIELDS_IN_TABLE{ lc $table } || [] };
-+    return @{ $FIELDS_IN_TABLE{ $table } };
- }
diff --git a/databases/p5-DBIx-SearchBuilder/pkg-plist b/databases/p5-DBIx-SearchBuilder/pkg-plist
index 73962f29d4e6..c043c18fca60 100644
--- a/databases/p5-DBIx-SearchBuilder/pkg-plist
+++ b/databases/p5-DBIx-SearchBuilder/pkg-plist
@@ -5,6 +5,7 @@
 %%SITE_PERL%%/DBIx/SearchBuilder/Record/Cachable.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Handle/Informix.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Handle/Pg.pm
+%%SITE_PERL%%/DBIx/SearchBuilder/Handle/Pg32.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Handle/mysql.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Handle/mysqlPP.pm
 %%SITE_PERL%%/DBIx/SearchBuilder/Handle/ODBC.pm
@@ -21,6 +22,7 @@
 %%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::ODBC.3.gz
 %%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::Oracle.3.gz
 %%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::Pg.3.gz
+%%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::Pg32.3.gz
 %%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::SQLite.3.gz
 %%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::Sybase.3.gz
 %%PERL5_MAN3%%/DBIx::SearchBuilder::Handle::mysql.3.gz