fix some naming version checks

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / Base.pm

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 0af7c1d..b95ed42 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -168,12 +168,26 @@ overwriting a dump made with an earlier version.
 
 The option also takes a hashref:
 
-    naming => { relationships => 'v8', monikers => 'v8' }
+    naming => {
+        relationships    => 'v8',
+        monikers         => 'v8',
+        column_accessors => 'v8',
+        force_ascii      => 1,
+    }
+
+or
+
+    naming => { ALL => 'v8', force_ascii => 1 }
 
 The keys are:
 
 =over 4
 
+=item ALL
+
+Set L</relationships>, L</monikers> and L</column_accessors> to the specified
+value.
+
 =item relationships
 
 How to name relationship accessors.
@@ -531,6 +545,10 @@ Default behavior is to utilize L<Lingua::EN::Inflect::Phrase/to_S>.
 
 Base class for your schema classes. Defaults to 'DBIx::Class::Schema'.
 
+=head2 schema_components
+
+List of components to load into the Schema class.
+
 =head2 result_base_class
 
 Base class for your table classes (aka result classes). Defaults to
@@ -549,10 +567,6 @@ that need to be leftmost.
 
 List of additional classes which all of your table classes will use.
 
-=head2 schema_components
-
-List of components to load into the Schema class.
-
 =head2 components
 
 List of additional components to be loaded into all of your Result
@@ -947,10 +961,16 @@ sub new {
             column_accessors => $naming_ver,
         };
     }
+    elsif (ref $self->naming eq 'HASH' && exists $self->naming->{ALL}) {
+        my $val = delete $self->naming->{ALL};
+
+        $self->naming->{$_} = $val
+            foreach qw/relationships monikers column_accessors/;
+    }
 
     if ($self->naming) {
-        for (values %{ $self->naming }) {
-            $_ = $CURRENT_V if $_ eq 'current';
+        foreach my $key (qw/relationships monikers column_accessors/) {
+            $self->naming->{$key} = $CURRENT_V if ($self->naming->{$key}||'') eq 'current';
         }
     }
     $self->{naming} ||= {};
@@ -2327,10 +2347,25 @@ sub tables {
     return values %{$self->_tables};
 }
 
+sub _get_naming_v {
+    my ($self, $naming_key) = @_;
+
+    my $v;
+
+    if (($self->naming->{$naming_key}||'') =~ /^v(\d+)\z/) {
+        $v = $1;
+    }
+    else {
+        ($v) = $CURRENT_V =~ /^v(\d+)\z/;
+    }
+
+    return $v;
+}
+
 sub _to_identifier {
     my ($self, $naming_key, $name, $sep_char) = @_;
 
-    my ($v) = ($self->naming->{$naming_key}||$CURRENT_V) =~ /^v(\d+)\z/;
+    my $v = $self->_get_naming_v($naming_key);
 
     my $to_identifier = $self->naming->{force_ascii} ?
         \&String::ToIdentifier::EN::to_identifier
@@ -2343,7 +2378,7 @@ sub _to_identifier {
 sub _default_table2moniker {
     my ($self, $table) = @_;
 
-    my ($v) = ($self->naming->{monikers}||$CURRENT_V) =~ /^v(\d+)\z/;
+    my $v = $self->_get_naming_v('monikers');
 
     my @name_parts = map $table->$_, @{ $self->moniker_parts };
 
@@ -2355,7 +2390,7 @@ sub _default_table2moniker {
         my $part = $name_parts[$i];
 
         if ($i != $name_idx || $v >= 8) {
-            $part = $self->_to_identifier->('monikers', $part, '_');
+            $part = $self->_to_identifier('monikers', $part, '_');
         }
 
         if ($i == $name_idx && $v == 5) {