Merge 'current' into 'deprecate_CDA'

r22316@hlagh (orig r8189):  caelum | 2009-12-30 16:27:49 -0500
rearrange some test code

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index 4f55c89..89cf56f 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -2,7 +2,7 @@ package DBIx::Class::Schema::Loader;
 
 use strict;
 use warnings;
-use base qw/DBIx::Class::Schema Class::Data::Accessor/;
+use base qw/DBIx::Class::Schema Class::Accessor::Grouped/;
 use Carp::Clan qw/^DBIx::Class/;
 use Class::C3;
 use Scalar::Util qw/ weaken /;
@@ -12,10 +12,15 @@ use Scalar::Util qw/ weaken /;
 # brain damage and presumably various other packaging systems too
 our $VERSION = '0.04999_12';
 
-__PACKAGE__->mk_classaccessor('_loader_args' => {});
-__PACKAGE__->mk_classaccessors(qw/
-    dump_to_dir _loader_invoked _loader loader_class naming
+__PACKAGE__->mk_group_accessors('inherited', qw/
+                                _loader_args
+                                dump_to_dir
+                                _loader_invoked
+                                _loader
+                                loader_class
+                                naming
 /);
+__PACKAGE__->_loader_args({});
 
 =head1 NAME
 
@@ -134,7 +139,7 @@ already been made is useless.
 
 sub loader_options {
     my $self = shift;
-    
+
     my %args = (ref $_[0] eq 'HASH') ? %{$_[0]} : @_;
     $self->_loader_args(\%args);
 
@@ -448,6 +453,8 @@ ribasushi: Peter Rabbitson <rabbit+dbic@rabbit.us>
 
 gugu: Andrey Kostenko <a.kostenko@rambler-co.ru>
 
+jhannah: Jay Hannah <jay@jays.net>
+
 ... and lots of other folks. If we forgot you, please write the current
 maintainer or RT.
 

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 00c8abd..f59caef 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -2,7 +2,7 @@ package DBIx::Class::Schema::Loader::Base;
 
 use strict;
 use warnings;
-use base qw/Class::Accessor::Fast Class::C3::Componentised/;
+use base qw/Class::Accessor::Grouped Class::C3::Componentised/;
 use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
 use DBIx::Class::Schema::Loader::RelBuilder;
@@ -18,7 +18,7 @@ require DBIx::Class;
 
 our $VERSION = '0.04999_12';
 
-__PACKAGE__->mk_ro_accessors(qw/
+__PACKAGE__->mk_group_ro_accessors('inherited', qw/
                                 schema
                                 schema_class
 
@@ -51,9 +51,10 @@ __PACKAGE__->mk_ro_accessors(qw/
                                 monikers
                                 dynamic
                                 naming
-                             /);
+/);
+
 
-__PACKAGE__->mk_accessors(qw/
+__PACKAGE__->mk_group_accessors('inherited', qw/
                                 version_to_dump
                                 schema_version_to_dump
                                 _upgrading_from
@@ -453,7 +454,7 @@ sub _find_file_in_inc {
         my $fullpath = File::Spec->catfile($prefix, $file);
         return $fullpath if -f $fullpath
             and Cwd::abs_path($fullpath) ne
-                Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || '';
+               (Cwd::abs_path(File::Spec->catfile($self->dump_directory, $file)) || '');
     }
 
     return;