Attachment 147090 Details for Bug 193472 – Version bump patch.

[patch] Version bump patch.

p5-DBIx-SearchBuilder-1.66-patch.diff (text/plain), 3.67 KB, created by Michelle Sullivan on 2014-09-09 00:56:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michelle Sullivan

Created: 2014-09-09 00:56:18 UTC

Size: 3.67 KB

patch

obsolete

>diff -Nru /usr/ports/databases/p5-DBIx-SearchBuilder/Makefile p5-DBIx-SearchBuilder/Makefile
>--- /usr/ports/databases/p5-DBIx-SearchBuilder/Makefile	2014-07-24 11:51:12.000000000 +0200
>+++ p5-DBIx-SearchBuilder/Makefile	2014-09-09 02:52:41.000000000 +0200
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/databases/p5-DBIx-SearchBuilder/Makefile 362774 2014-07-24 09:51:12Z demon $
> 
> PORTNAME=	DBIx-SearchBuilder
>-PORTVERSION=	1.65
>+PORTVERSION=	1.66
> PORTREVISION=	1
> CATEGORIES=	databases perl5
> MASTER_SITES=	CPAN
>@@ -26,4 +26,8 @@
> 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 -Nru /usr/ports/databases/p5-DBIx-SearchBuilder/distinfo p5-DBIx-SearchBuilder/distinfo
>--- /usr/ports/databases/p5-DBIx-SearchBuilder/distinfo	2013-09-16 12:53:08.000000000 +0200
>+++ p5-DBIx-SearchBuilder/distinfo	2014-09-09 02:53:35.000000000 +0200
>@@ -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 -Nru /usr/ports/databases/p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1 p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1
>--- /usr/ports/databases/p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1	2014-07-24 08:01:58.000000000 +0200
>+++ p5-DBIx-SearchBuilder/files/patch-upstream-1.65_1	1970-01-01 01:00:00.000000000 +0100
>@@ -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 } };
>- }

Actions: View | Diff

Attachments on bug 193472: 147088 | 147090