r52453 - in /branches/upstream/libcatalyst-model-cdbi-perl/current: Changes META.yml Makefile.PL lib/Catalyst/Helper/Model/CDBI.pm lib/Catalyst/Model/CDBI.pm t/01use.t
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Wed Feb 10 14:59:42 UTC 2010
Author: ansgar-guest
Date: Wed Feb 10 14:59:36 2010
New Revision: 52453
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52453
Log:
[svn-upgrade] Integrating new upstream version, libcatalyst-model-cdbi-perl (0.12)
Modified:
branches/upstream/libcatalyst-model-cdbi-perl/current/Changes
branches/upstream/libcatalyst-model-cdbi-perl/current/META.yml
branches/upstream/libcatalyst-model-cdbi-perl/current/Makefile.PL
branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Helper/Model/CDBI.pm
branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Model/CDBI.pm
branches/upstream/libcatalyst-model-cdbi-perl/current/t/01use.t
Modified: branches/upstream/libcatalyst-model-cdbi-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-model-cdbi-perl/current/Changes?rev=52453&op=diff
==============================================================================
--- branches/upstream/libcatalyst-model-cdbi-perl/current/Changes (original)
+++ branches/upstream/libcatalyst-model-cdbi-perl/current/Changes Wed Feb 10 14:59:36 2010
@@ -1,6 +1,12 @@
Revision history for Perl extension Catalyst::Model::CDBI.
+0.12 Tue Jan 09 02:36:00
+ - Work around MRO problems in CDBI by massaging CDBI::__::Base's ISA
+ - Switch from NEXT to MRO::Compat
+ - Switch from Catalyst::Base to Catalyst::Component
+ - Fix RT#18197
+ - Add deprecation notice.
-0.11
+0.11 Wed Nov 23 09:46:00 2005
- Throw an exception during startup if there is an error loading
tables.
Modified: branches/upstream/libcatalyst-model-cdbi-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-model-cdbi-perl/current/META.yml?rev=52453&op=diff
==============================================================================
--- branches/upstream/libcatalyst-model-cdbi-perl/current/META.yml (original)
+++ branches/upstream/libcatalyst-model-cdbi-perl/current/META.yml Wed Feb 10 14:59:36 2010
@@ -1,13 +1,25 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Catalyst-Model-CDBI
-version: 0.11
-version_from: lib/Catalyst/Model/CDBI.pm
-installdirs: site
+--- #YAML:1.0
+name: Catalyst-Model-CDBI
+version: 0.12
+abstract: ~
+author:
+ - Sebastian Riedel (sri at oook.de)
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
- Catalyst: 4.00
- Class::DBI: 0
- Class::DBI::Loader: 0.2
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+ Catalyst: 4.00
+ Class::DBI: 0
+ Class::DBI::Loader: 0.2
+ MRO::Compat: 0
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.54
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: branches/upstream/libcatalyst-model-cdbi-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-model-cdbi-perl/current/Makefile.PL?rev=52453&op=diff
==============================================================================
--- branches/upstream/libcatalyst-model-cdbi-perl/current/Makefile.PL (original)
+++ branches/upstream/libcatalyst-model-cdbi-perl/current/Makefile.PL Wed Feb 10 14:59:36 2010
@@ -5,6 +5,7 @@
AUTHOR => 'Sebastian Riedel (sri at oook.de)',
PREREQ_PM => {
Catalyst => '4.00',
+ MRO::Compat => 0,
Class::DBI => 0,
Class::DBI::Loader => 0.20
},
Modified: branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Helper/Model/CDBI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Helper/Model/CDBI.pm?rev=52453&op=diff
==============================================================================
--- branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Helper/Model/CDBI.pm (original)
+++ branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Helper/Model/CDBI.pm Wed Feb 10 14:59:36 2010
@@ -2,6 +2,7 @@
use strict;
use Class::DBI::Loader;
+use Class::DBI;
use File::Spec;
=head1 NAME
Modified: branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Model/CDBI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Model/CDBI.pm?rev=52453&op=diff
==============================================================================
--- branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Model/CDBI.pm (original)
+++ branches/upstream/libcatalyst-model-cdbi-perl/current/lib/Catalyst/Model/CDBI.pm Wed Feb 10 14:59:36 2010
@@ -1,17 +1,24 @@
package Catalyst::Model::CDBI;
+# work around CDBI being incompatible with C3 mro, due to both Ima::DBI and Class::DBI::__::Base
+# inheriting from Class::Data::Inheritable in an inconsistent order.
+BEGIN {
+ require Class::DBI;
+ @Class::DBI::__::Base::ISA = grep { $_ ne 'Class::Data::Inheritable' } @Class::DBI::__::Base::ISA;
+}
+
use strict;
-use base qw/Catalyst::Base Class::DBI/;
-use NEXT;
+use base qw/Catalyst::Component Class::DBI/;
+use MRO::Compat;
use Class::DBI::Loader;
-our $VERSION = '0.11';
+our $VERSION = '0.12';
__PACKAGE__->mk_accessors('loader');
=head1 NAME
-Catalyst::Model::CDBI - CDBI Model Class
+Catalyst::Model::CDBI - [DEPRECATED] CDBI Model Class
=head1 SYNOPSIS
@@ -42,7 +49,12 @@
=head1 DESCRIPTION
This is the C<Class::DBI> model class. It's built on top of
-C<Class::DBI::Loader>.
+C<Class::DBI::Loader>. C<Class::DBI> is generally not used for new
+applications, with C<DBIx::Class> being preferred instead. As such
+this model is deprecated and (mostly) unmaintained.
+
+It is preserved here for older applications which still need it for
+backwards compatibility.
=head2 new
@@ -53,7 +65,7 @@
sub new {
my $class = shift;
- my $self = $class->NEXT::new( @_ );
+ my $self = $class->next::method( @_ );
my $c = shift;
$self->{namespace} ||= ref $self;
$self->{additional_base_classes} ||= ();
@@ -84,7 +96,16 @@
Sebastian Riedel, C<sri at cpan.org>
+=head1 CONTRIBUTORS
+
+mst: Matt S Trout C<mst at shadowcat.co.uk>
+
+Arathorn: Matthew Hodgson C<matthew at arasphere.net>
+
=head1 COPYRIGHT
+
+Copyright (c) 2005 - 2010 the Catalyst::Model::CDBI L</AUTHOR> and
+L</CONTRIBUTORS> as listed above.
This program is free software, you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: branches/upstream/libcatalyst-model-cdbi-perl/current/t/01use.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcatalyst-model-cdbi-perl/current/t/01use.t?rev=52453&op=diff
==============================================================================
--- branches/upstream/libcatalyst-model-cdbi-perl/current/t/01use.t (original)
+++ branches/upstream/libcatalyst-model-cdbi-perl/current/t/01use.t Wed Feb 10 14:59:36 2010
@@ -1,5 +1,8 @@
use strict;
-use Test::More tests => 2;
+use Test::More tests => 3;
BEGIN { use_ok('Catalyst::Model::CDBI') }
BEGIN { use_ok('Catalyst::Helper::Model::CDBI') }
+
+use MRO::Compat;
+ok(eval { mro::get_linear_isa('Catalyst::Model::CDBI'); 1 }, 'Linearise ok');
More information about the Pkg-perl-cvs-commits
mailing list