add is_deferrable => 1 to belongs_to by default

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

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index 359c9a7..904e5d1 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -5,6 +5,7 @@ use warnings;
 use Class::C3;
 use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Number ();
+use Lingua::EN::Inflect::Phrase ();
 
 our $VERSION = '0.05003';
 
@@ -118,7 +119,7 @@ sub _inflect_plural {
 
 # Singularize a relationship name
 sub _inflect_singular {
-    my ($self, $relname) = @_;
+    my ($self, $relname, $method) = @_;
 
     return '' if !defined $relname || $relname eq '';
 
@@ -131,14 +132,16 @@ sub _inflect_singular {
         return $inflected if $inflected;
     }
 
-    return $self->_to_S($relname);
+    $method ||= '_to_S';
+
+    return $self->$method($relname);
 }
 
 sub _to_PL {
     my ($self, $name) = @_;
 
     $name =~ s/_/ /g;
-    my $plural = Lingua::EN::Inflect::Number::to_PL($name);
+    my $plural = Lingua::EN::Inflect::Phrase::to_PL($name);
     $plural =~ s/ /_/g;
 
     return $plural;
@@ -153,6 +156,16 @@ sub _old_to_PL {
 sub _to_S {
     my ($self, $name) = @_;
 
+    $name =~ s/_/ /g;
+    my $singular = Lingua::EN::Inflect::Phrase::to_S($name);
+    $singular =~ s/ /_/g;
+
+    return $singular;
+}
+
+sub _old_to_S {
+    my ($self, $name) = @_;
+
     return Lingua::EN::Inflect::Number::to_S($name);
 }
 
@@ -168,6 +181,7 @@ sub _default_relationship_attrs { +{
     belongs_to => {
         on_delete => 'CASCADE',
         on_update => 'CASCADE',
+        is_deferrable => 1,
     },
 } }
 
@@ -344,7 +358,7 @@ sub _relnames_and_method {
             grep { _array_eq($_->[1], $local_cols) } @$uniqs) {
         $remote_method = 'might_have';
         $local_relname = $self->_inflect_singular($local_relname_uninflected);
-        $old_local_relname = $self->_inflect_singular($old_local_relname_uninflected);
+        $old_local_relname = $self->_inflect_singular($old_local_relname_uninflected, '_old_to_S');
     }
 
     warn __PACKAGE__." $VERSION: renaming ${remote_class} relation '$old_local_relname' to '$local_relname'.  This behavior is new as of 0.05003.\n" if $old_local_relname && $local_relname ne $old_local_relname;