X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader.pm;h=89cf56fe471bdcd4e5ad10e45e7ef080b39d9eed;hb=65e705c303fe8a3bfea7ddb96c4bb97ff2df7c07;hp=c4c128f151bfe72c07d094d0921fff4fe5fb6784;hpb=9cc8e7e177103e568c99f968ff848d25e6c3bea8;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index c4c128f..89cf56f 100644
--- 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);
 
@@ -152,7 +157,7 @@ sub _invoke_loader {
     $args->{schema_class} = $class;
     weaken($args->{schema}) if ref $self;
     $args->{dump_directory} ||= $self->dump_to_dir;
-    $args->{naming} = $self->naming;
+    $args->{naming} = $self->naming if $self->naming;
 
     # XXX this only works for relative storage_type, like ::DBI ...
     my $impl = $self->loader_class
@@ -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.