X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FBase.pm;h=1a6d5a1006a54dd9a5a182136efa84e9f45fb894;hb=7cbfc0c178d368a5aaf587cade3b167db1ced8ad;hp=6e1167957f3b7f2bbd50cc636dd17b1daafecd6e;hpb=d36c8734a5b871d1fe5ce3502e0dad29f4b7375b;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 6e11679..1a6d5a1 100644
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -92,6 +92,7 @@ __PACKAGE__->mk_group_accessors('simple', qw/
                                 result_roles_map
                                 datetime_undef_if_invalid
                                 _result_class_methods
+                                naming_set
 /);
 
 =head1 NAME
@@ -708,6 +709,13 @@ sub new {
     $self->version_to_dump($DBIx::Class::Schema::Loader::VERSION);
     $self->schema_version_to_dump($DBIx::Class::Schema::Loader::VERSION);
 
+    if (not defined $self->naming) {
+        $self->naming_set(0);
+    }
+    else {
+        $self->naming_set(1);
+    }
+
     if ((not ref $self->naming) && defined $self->naming) {
         my $naming_ver = $self->naming;
         $self->{naming} = {
@@ -773,14 +781,13 @@ EOF
             $self->_upgrading_from('v4');
         }
 
-        $self->naming->{relationships} ||= 'v4';
-        $self->naming->{monikers}      ||= 'v4';
-
-        if ((not defined $self->use_namespaces)
-            && $self->naming->{monikers} ne 'v4') {
+        if ((not defined $self->use_namespaces) && (not $self->naming_set)) {
             $self->use_namespaces(1);
         }
 
+        $self->naming->{relationships} ||= 'v4';
+        $self->naming->{monikers}      ||= 'v4';
+
         if ($self->use_namespaces) {
             $self->_upgrading_from_load_classes(1);
         }