pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/databases/p5-Tie-DBI Updated databases/p5-Tie-DBI to 1.06
details: https://anonhg.NetBSD.org/pkgsrc/rev/3e8ee66767e0
branches: trunk
changeset: 361765:3e8ee66767e0
user: mef <mef%pkgsrc.org@localhost>
date: Wed Apr 26 12:46:27 2017 +0000
description:
Updated databases/p5-Tie-DBI to 1.06
------------------------------------
1.06 Fri Apr 5 2013 Todd Rinaldo
Bump to production release now tests all pass on cpan testers
1.05_01 Thu Mar 28 2013 Todd Rinaldo
Fix for RT 58813 - Fix for File based DBDs
Fix for RT 84125 - Fix for mysqlPP
(pkgsrc changes)
- drop two patches, those were really provided by upstream after previous version
- Add do-test: target, for doing without any environment. Hope this will give PASS
diffstat:
databases/p5-Tie-DBI/Makefile | 9 ++-
databases/p5-Tie-DBI/distinfo | 12 +--
databases/p5-Tie-DBI/patches/patch-aa | 64 -------------------------
databases/p5-Tie-DBI/patches/patch-ab | 88 -----------------------------------
4 files changed, 11 insertions(+), 162 deletions(-)
diffs (203 lines):
diff -r 4c8945c3bc9d -r 3e8ee66767e0 databases/p5-Tie-DBI/Makefile
--- a/databases/p5-Tie-DBI/Makefile Wed Apr 26 12:10:43 2017 +0000
+++ b/databases/p5-Tie-DBI/Makefile Wed Apr 26 12:46:27 2017 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/06/08 19:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/04/26 12:46:27 mef Exp $
#
-DISTNAME= Tie-DBI-1.05
+DISTNAME= Tie-DBI-1.06
PKGNAME= p5-${DISTNAME}
-PKGREVISION= 7
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tie/}
@@ -19,6 +18,10 @@
pre-configure:
cd ${WRKSRC} && find `pwd` -name "*.orig" -type f | xargs rm
+# no environment may give make test PASS
+do-test:
+ cd ${WRKSRC} && ${MAKE} test
+
.include "../../databases/p5-DBI/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 4c8945c3bc9d -r 3e8ee66767e0 databases/p5-Tie-DBI/distinfo
--- a/databases/p5-Tie-DBI/distinfo Wed Apr 26 12:10:43 2017 +0000
+++ b/databases/p5-Tie-DBI/distinfo Wed Apr 26 12:46:27 2017 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 01:56:23 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/04/26 12:46:27 mef Exp $
-SHA1 (Tie-DBI-1.05.tar.gz) = f949e34e29b0290f7489359ea00e332f88a8f907
-RMD160 (Tie-DBI-1.05.tar.gz) = 1536fcc99a0c0fc803efc6c1cd91fb398430a6ed
-SHA512 (Tie-DBI-1.05.tar.gz) = 56e9ed4adc4257d6d89ef8d8924672ca552a4b5b4422f92e34dc64cff4e1a77aae7948348fdde10978911813374659cee6554297c18d94338b960c3a61585ccb
-Size (Tie-DBI-1.05.tar.gz) = 24212 bytes
-SHA1 (patch-aa) = e3ee17fdc5572a513c6c9e1ca5a5c2791aa255fc
-SHA1 (patch-ab) = c5c953aea316d92358693e4929c1be896f4805ad
+SHA1 (Tie-DBI-1.06.tar.gz) = bddfa88a4f9628b8dc9fd67c8574c7846304cb22
+RMD160 (Tie-DBI-1.06.tar.gz) = 1cd36982507017641b1a7d8f78fe1f0c38be4c4f
+SHA512 (Tie-DBI-1.06.tar.gz) = a501505532c2bf3ccbe8a93d36904b39bd15ee3c75df70317862555c623902ab4cb88dd3712ffc2e37171a59fe1351bf95a1a59bb7ad8d9e726d2d367623fdb2
+Size (Tie-DBI-1.06.tar.gz) = 24951 bytes
diff -r 4c8945c3bc9d -r 3e8ee66767e0 databases/p5-Tie-DBI/patches/patch-aa
--- a/databases/p5-Tie-DBI/patches/patch-aa Wed Apr 26 12:10:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/07/31 07:24:38 sno Exp $
-
-Respect DBI_DSN etc. - and do not prompt for test DSN's
-
---- t/DBI.t.orig 2010-06-19 13:01:36.000000000 +0000
-+++ t/DBI.t
-@@ -1,10 +1,10 @@
- use strict;
- use warnings;
--use Test::More tests => 26;
-+use Test::More;
-
- my $DRIVER = $ENV{DRIVER};
--use constant USER => $ENV{USER};
--use constant PASS => $ENV{PASS};
-+use constant USER => $ENV{USER} || $ENV{DBI_USER};
-+use constant PASS => $ENV{PASS} || $ENV{DBI_PASS};
- use constant DBNAME => $ENV{DB} || 'test';
- use constant HOST => $ENV{HOST} || ($^O eq 'cygwin') ? '127.0.0.1' : 'localhost';
-
-@@ -13,6 +13,10 @@ use Tie::DBI;
-
- ######################### End of black magic.
-
-+if ($ENV{DBI_DSN} && !$DRIVER) {
-+ ($DRIVER = $ENV{DBI_DSN}) =~ s/^dbi:([^:]+):.*$/$1/i;
-+}
-+
- unless ($DRIVER) {
- local($^W)=0; # kill uninitialized variable warning
- # I like mysql best, followed by Oracle and Sybase
-@@ -22,9 +26,10 @@ unless ($DRIVER) {
- }
-
- if ($DRIVER) {
-+ plan tests => 26;
- diag("DBI.t - Using DBD driver $DRIVER...");
- } else {
-- die "Found no DBD driver to use.\n";
-+ plan skip_all => "Found no DBD driver to use.\n";
- }
-
- my %TABLES = (
-@@ -79,8 +84,9 @@ my @test_data = (
- sub initialize_database {
- local($^W) = 0;
- my $dsn;
-- if ($DRIVER eq 'Pg') { $dsn = "dbi:$DRIVER:dbname=${\DBNAME}"; }
-- else { $dsn = "dbi:$DRIVER:${\DBNAME}:${\HOST}"; }
-+ if( $ENV{DBI_DSN} ) { $dsn = $ENV{DBI_DSN}; }
-+ elsif ($DRIVER eq 'Pg') { $dsn = "dbi:$DRIVER:dbname=${\DBNAME}"; }
-+ else { $dsn = "dbi:$DRIVER:${\DBNAME}:${\HOST}"; }
- my $dbh = DBI->connect($dsn,USER,PASS,{PrintError=>0}) || return undef;
- $dbh->do("DROP TABLE testTie");
- return $dbh if $DRIVER eq 'ExampleP';
-@@ -121,7 +127,7 @@ isa_ok(tie(%h,'Tie::DBI',{db=>$dbh,table
- is(scalar(keys %h), 0, '%h is empty');
-
- {
-- local($^W = 0);
-+ local $^W = 0;
- ok(insert_data(\%h), "Insert data into db");
- }
- ok(exists($h{strawberries}));
diff -r 4c8945c3bc9d -r 3e8ee66767e0 databases/p5-Tie-DBI/patches/patch-ab
--- a/databases/p5-Tie-DBI/patches/patch-ab Wed Apr 26 12:10:43 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/07/31 07:24:38 sno Exp $
-
-Fix several issue because of depreciated design
-
---- lib/Tie/DBI.pm.orig 2010-04-10 06:15:01.000000000 +0000
-+++ lib/Tie/DBI.pm
-@@ -27,23 +27,35 @@ my %DefaultOptions = (
- # DBD drivers that work correctly with bound variables
- my %CAN_BIND = (
- 'ODBC' => 1,
-+ 'AnyData' => 1,
- 'mysql' => 1,
- 'mSQL' => 1,
- 'Oracle' => 1,
- 'CSV' => 1,
-+ 'DBM' => 1,
-+ 'Sys' => 1,
- 'Pg' => 1,
-+ 'PO' => 1,
- 'Informix' => 1,
- 'Solid' => 1,
- );
- my %CANNOT_LISTFIELDS = (
- 'SQLite' => 1,
- 'Oracle' => 1,
-+ 'CSV' => 1,
-+ 'DBM' => 1,
-+ 'PO' => 1,
-+ 'AnyData' => 1,
- );
- my %CAN_BINDSELECT = (
- 'mysql' => 1,
- 'mSQL' => 1,
- 'CSV' => 1,
- 'Pg' => 1,
-+ 'Sys' => 1,
-+ 'DBM' => 1,
-+ 'AnyData' => 1,
-+ 'PO' => 1,
- 'Informix' => 1,
- 'Solid' => 1,
- 'ODBC' => 1,
-@@ -59,6 +71,11 @@ my %DOES_IN = (
- 'mysql' => 1,
- 'Oracle' => 1,
- 'Sybase' => 1,
-+ 'CSV' => 1,
-+ 'DBM' => 1, # at least with SQL::Statement
-+ 'AnyData' => 1,
-+ 'Sys' => 1,
-+ 'PO' => 1,
- );
-
-
-@@ -278,11 +295,11 @@ sub STORE {
- $s->_update($key,\@fields,\@values)
- : $s->_insert($key,\@fields,\@values);
- } else {
-- $result = eval {
-+ eval {
- local($s->{'dbh'}->{PrintError}) = 0; # suppress warnings
-- $s->_insert($key,\@fields,\@values);
-- }
-- || $s->_update($key,\@fields,\@values);
-+ $result = $s->_insert($key,\@fields,\@values);
-+ };
-+ $result or $result = $s->_update($key,\@fields,\@values);
- }
- croak "STORE: ",$s->errstr if $s->error;
-
-@@ -361,7 +378,7 @@ sub _run_query {
- # if we get here, then we can't bind, so we replace ? with escaped parameters
- while ( (my $pos = index($query, '?')) >= 0 ) {
- my $value = shift(@bind_variables);
-- substr($query, $pos, 1) = (defined($value) ? $value : 'null');
-+ substr($query, $pos, 1) = (defined($value) ? ( $self->{CanBind} ? $self->{'dbh'}->quote($value) : $value ) : 'null');
- }
- my $sth = $self->{'dbh'}->prepare($query);
- return unless $sth && $sth->execute;
-@@ -375,7 +392,7 @@ sub _fields {
- my ($dbh,$table) = @{$self}{'dbh','table'};
-
- local($^W) = 0; # kill uninitialized variable warning
-- my $sth = $dbh->prepare("LISTFIELDS $table");
-+ my $sth = $dbh->prepare("LISTFIELDS $table") unless($self->{CannotListfields});
-
- # doesn't support LISTFIELDS, so try SELECT *
- unless (!$self->{CannotListfields} && defined($sth) && $sth->execute) {
Home |
Main Index |
Thread Index |
Old Index