r33877 - in /branches/upstream/librose-db-perl/current: Changes META.yml lib/Rose/DB.pm lib/Rose/DB/Cache.pm t/00-warning.t t/basic.t t/sqlite.t t/subclass-basic.t t/subclass-sqlite.t t/test-lib.pl
bricas-guest at users.alioth.debian.org
bricas-guest at users.alioth.debian.org
Fri Apr 24 12:04:53 UTC 2009
Author: bricas-guest
Date: Fri Apr 24 12:04:47 2009
New Revision: 33877
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=33877
Log:
[svn-upgrade] Integrating new upstream version, librose-db-perl (0.751)
Modified:
branches/upstream/librose-db-perl/current/Changes
branches/upstream/librose-db-perl/current/META.yml
branches/upstream/librose-db-perl/current/lib/Rose/DB.pm
branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm
branches/upstream/librose-db-perl/current/t/00-warning.t
branches/upstream/librose-db-perl/current/t/basic.t
branches/upstream/librose-db-perl/current/t/sqlite.t
branches/upstream/librose-db-perl/current/t/subclass-basic.t
branches/upstream/librose-db-perl/current/t/subclass-sqlite.t
branches/upstream/librose-db-perl/current/t/test-lib.pl
Modified: branches/upstream/librose-db-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/Changes?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/Changes (original)
+++ branches/upstream/librose-db-perl/current/Changes Fri Apr 24 12:04:47 2009
@@ -1,3 +1,9 @@
+0.751 (04.19.2009) - John Siracusa <siracusa at gmail.com>
+
+ * Worked around a mod_perl 2 issue related to PerlOptions +Parent
+ http://bit.ly/160jLN (Reported by Anton)
+ * Updated test suite to consider DBD::SQLite 1.19+ non-broken.
+
0.750 (02.26.2009) - Peter Karman <perl at peknet.com>
* Added pg_enable_utf8 attribute.
Modified: branches/upstream/librose-db-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/META.yml?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/META.yml (original)
+++ branches/upstream/librose-db-perl/current/META.yml Fri Apr 24 12:04:47 2009
@@ -1,11 +1,13 @@
--- #YAML:1.0
name: Rose-DB
-version: 0.750
+version: 0.751
abstract: ~
author: []
license: perl
distribution_type: module
configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
ExtUtils::MakeMaker: 0
requires:
Bit::Vector::Overload: 6.4
@@ -31,7 +33,7 @@
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.48
+generated_by: ExtUtils::MakeMaker version 6.50
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/lib/Rose/DB.pm?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB.pm Fri Apr 24 12:04:47 2009
@@ -20,7 +20,7 @@
our $Error;
-our $VERSION = '0.750';
+our $VERSION = '0.751';
our $Debug = 0;
Modified: branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm (original)
+++ branches/upstream/librose-db-perl/current/lib/Rose/DB/Cache.pm Fri Apr 24 12:04:47 2009
@@ -7,7 +7,7 @@
use Scalar::Util qw(refaddr);
use Rose::DB::Cache::Entry;
-our $VERSION = '0.749';
+our $VERSION = '0.751';
our $Debug = 0;
@@ -188,16 +188,20 @@
$Debug && warn "$$ is already MP2 child (not registering child init handler)\n";
$MP2_Is_Child = 1;
}
- else
- {
- Apache2::ServerUtil->server->push_handlers(PerlChildInitHandler => sub
- {
- $Debug && warn "$$ is MP2 child\n";
- $MP2_Is_Child = 1;
-
- return Apache2::Const::OK();
- });
- }
+ elsif(!$ENV{'ROSE_DB_NO_CHILD_INIT_HANDLER'})
+ {
+ Apache2::ServerUtil->server->push_handlers(
+ PerlChildInitHandler => \&__mod_perl_2_rose_db_child_init_handler);
+ }
+}
+
+# http://mail-archives.apache.org/mod_mbox/perl-dev/200504.mbox/%3C4256B5FF.5060401@stason.org%3E
+# To work around this issue, we'll use a named subroutine.
+sub __mod_perl_2_rose_db_child_init_handler
+{
+ $Debug && warn "$$ is MP2 child\n";
+ $MP2_Is_Child = 1;
+ return Apache2::Const::OK();
}
sub apache_has_started
Modified: branches/upstream/librose-db-perl/current/t/00-warning.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/00-warning.t?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/00-warning.t (original)
+++ branches/upstream/librose-db-perl/current/t/00-warning.t Fri Apr 24 12:04:47 2009
@@ -54,7 +54,9 @@
eval { require DBD::SQLite };
-if(!$@ && $DBD::SQLite::VERSION == 1.13)
+(my $version = $DBD::SQLite::VERSION || 0) =~ s/_//g;
+
+if(!$@ && ($version < 1.11 || ($version >= 1.13 && $version < 1.1902)))
{
print STDERR<<"EOF";
Modified: branches/upstream/librose-db-perl/current/t/basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/basic.t?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/basic.t (original)
+++ branches/upstream/librose-db-perl/current/t/basic.t Fri Apr 24 12:04:47 2009
@@ -71,9 +71,7 @@
sub format_date { die "boo!" }
}
-eval { require DBD::SQLite };
-my $version = $DBD::SQLite::VERSION || 0;
-my $sqlite_ok = ($ENV{'RDBO_NO_SQLITE'} || $version < 1.08 || $version == 1.13) ? 0 : 1;
+my $sqlite_ok = have_db('sqlite_admin');
is_deeply(scalar Rose::DB->registry->registered_domains,
[ qw(atest catalog_test default test) ], 'registered_domains()');
Modified: branches/upstream/librose-db-perl/current/t/sqlite.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/sqlite.t?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/sqlite.t (original)
+++ branches/upstream/librose-db-perl/current/t/sqlite.t Fri Apr 24 12:04:47 2009
@@ -7,32 +7,19 @@
BEGIN
{
require Test::More;
- eval
+ require 't/test-lib.pl';
+
+ if(have_db('sqlite_admin'))
{
- local $^W = 0;
- require DBD::SQLite;
- };
-
- if($@ || $DBD::SQLite::VERSION < 1.08 || $ENV{'RDBO_NO_SQLITE'})
- {
- Test::More->import(skip_all => $ENV{'RDBO_NO_SQLITE'} ?
- 'SQLite tests disabled' : 'Missing DBD::SQLite 1.08+');
- }
- elsif($DBD::SQLite::VERSION == 1.13)
- {
- Test::More->import(skip_all => 'DBD::SQLite 1.13 is broken');
+ Test::More->import(tests => 44);
}
else
{
- Test::More->import(tests => 44);
+ Test::More->import(skip_all => 'DBD::SQLite unavailable or broken');
}
}
-BEGIN
-{
- require 't/test-lib.pl';
- use_ok('Rose::DB');
-}
+use_ok('Rose::DB');
Rose::DB->default_domain('test');
Rose::DB->default_type('sqlite_admin');
Modified: branches/upstream/librose-db-perl/current/t/subclass-basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/subclass-basic.t?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/subclass-basic.t (original)
+++ branches/upstream/librose-db-perl/current/t/subclass-basic.t Fri Apr 24 12:04:47 2009
@@ -71,9 +71,7 @@
sub format_date { die "boo!" }
}
-eval { require DBD::SQLite };
-my $version = $DBD::SQLite::VERSION || 0;
-my $sqlite_ok = ($ENV{'RDBO_NO_SQLITE'} || $version < 1.08 || $version == 1.13) ? 0 : 1;
+my $sqlite_ok = have_db('sqlite_admin');
is_deeply(scalar My::DB2->registry->registered_domains,
[ qw(atest catalog_test default test) ], 'registered_domains()');
Modified: branches/upstream/librose-db-perl/current/t/subclass-sqlite.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/subclass-sqlite.t?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/subclass-sqlite.t (original)
+++ branches/upstream/librose-db-perl/current/t/subclass-sqlite.t Fri Apr 24 12:04:47 2009
@@ -7,32 +7,19 @@
BEGIN
{
require Test::More;
- eval
+ require 't/test-lib.pl';
+
+ if(have_db('sqlite_admin'))
{
- local $^W = 0;
- require DBD::SQLite;
- };
-
- if($@ || $DBD::SQLite::VERSION < 1.08 || $ENV{'RDBO_NO_SQLITE'})
- {
- Test::More->import(skip_all => $ENV{'RDBO_NO_SQLITE'} ?
- 'SQLite tests disabled' : 'Missing DBD::SQLite 1.08+');
- }
- elsif($DBD::SQLite::VERSION == 1.13)
- {
- Test::More->import(skip_all => 'DBD::SQLite 1.13 is broken');
+ Test::More->import(tests => 44);
}
else
{
- Test::More->import(tests => 44);
+ Test::More->import(skip_all => 'DBD::SQLite unavailable or broken');
}
}
-BEGIN
-{
- require 't/test-lib.pl';
- use_ok('Rose::DB');
-}
+use_ok('Rose::DB');
My::DB2->default_domain('test');
My::DB2->default_type('sqlite_admin');
Modified: branches/upstream/librose-db-perl/current/t/test-lib.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-db-perl/current/t/test-lib.pl?rev=33877&op=diff
==============================================================================
--- branches/upstream/librose-db-perl/current/t/test-lib.pl (original)
+++ branches/upstream/librose-db-perl/current/t/test-lib.pl Fri Apr 24 12:04:47 2009
@@ -183,9 +183,9 @@
require DBD::SQLite;
};
- my $version = $DBD::SQLite::VERSION || 0;
-
- unless($ENV{'RDBO_NO_SQLITE'} || $version < 1.08 || $version == 1.13)
+ (my $version = $DBD::SQLite::VERSION || 0) =~ s/_//g;
+
+ unless($ENV{'RDBO_NO_SQLITE'} || $version < 1.11 || ($version >= 1.13 && $version < 1.1902))
{
# Main
Rose::DB->register_db(
@@ -338,7 +338,7 @@
my $db = Rose::DB->new($type);
$db->print_error(0);
$dbh = $db->retain_dbh or die Rose::DB->error;
- $dbh->print_error(1);
+ $db->print_error(1);
};
if(!$@ && $dbh)
More information about the Pkg-perl-cvs-commits
mailing list