[Bast-commits] r4959 - in DBIx-Class/0.08/trunk: lib/DBIx/Class/CDBICompat t/cdbi-t

[schwern at dev.catalyst.perl.org]

Author: schwern
Date: 2008-10-24 03:54:25 +0100 (Fri, 24 Oct 2008)
New Revision: 4959

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ImaDBI.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/TempColumns.pm
   DBIx-Class/0.08/trunk/t/cdbi-t/15-accessor.t
Log:
Using DBIx::Class as a parent causes Class::Accessor::Grouped to be
introduced to the hierarchy too early and thus CDBICompat::AccessorMapping's
own mk_group_accessor() not get called.

The only reason we're inheriting from DBIx::Class is to get mk_classdata().
Get it from Class::Data::Inheritable instead.  mk_classdata() should be
moved out of DBIx::Class into a role to avoid this problem.

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm	2008-10-23 21:54:03 UTC (rev 4958)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ColumnCase.pm	2008-10-24 02:54:25 UTC (rev 4959)
@@ -4,8 +4,6 @@
 use strict;
 use warnings;
 
-use base qw/DBIx::Class/;
-
 sub _register_column_group {
   my ($class, $group, @cols) = @_;
   return $class->next::method($group => map lc, @cols);

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ImaDBI.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ImaDBI.pm	2008-10-23 21:54:03 UTC (rev 4958)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/ImaDBI.pm	2008-10-24 02:54:25 UTC (rev 4959)
@@ -6,7 +6,7 @@
 use DBIx::ContextualFetch;
 use Sub::Name ();
 
-use base qw/DBIx::Class/;
+use base qw(Class::Data::Inheritable);
 
 __PACKAGE__->mk_classdata('sql_transformer_class' =>
                           'DBIx::Class::CDBICompat::SQLTransformer');

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/TempColumns.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/TempColumns.pm	2008-10-23 21:54:03 UTC (rev 4958)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/TempColumns.pm	2008-10-24 02:54:25 UTC (rev 4959)
@@ -3,7 +3,7 @@
 
 use strict;
 use warnings;
-use base qw/DBIx::Class/;
+use base qw/Class::Data::Inheritable/;
 
 use Carp;
 

Modified: DBIx-Class/0.08/trunk/t/cdbi-t/15-accessor.t
===================================================================
--- DBIx-Class/0.08/trunk/t/cdbi-t/15-accessor.t	2008-10-23 21:54:03 UTC (rev 4958)
+++ DBIx-Class/0.08/trunk/t/cdbi-t/15-accessor.t	2008-10-24 02:54:25 UTC (rev 4959)
@@ -41,7 +41,7 @@
 	return $col;
 }
 
-# This is a class with accessor_name_for() but no corresponding mutatori_name_for()
+# This is a class with accessor_name_for() but no corresponding mutator_name_for()
 sub Director::accessor_name_for {
     my($class, $col) = @_;
     return "nutty_as_a_fruitcake" if lc $col eq "isinsane";