Merge branch 'master' into 0.08

[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 a0de181..4f58a61 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -7,7 +7,7 @@ use Carp::Clan qw/^DBIx::Class/;
 use Lingua::EN::Inflect::Phrase ();
 use DBIx::Class::Schema::Loader::Utils 'split_name';
 
-our $VERSION = '0.07001';
+our $VERSION = '0.08000';
 
 =head1 NAME
 
@@ -164,7 +164,7 @@ sub _default_relationship_attrs { +{
     belongs_to => {
         on_delete => 'CASCADE',
         on_update => 'CASCADE',
-#        is_deferrable => 1,
+        is_deferrable => 1,
     },
 } }
 
@@ -188,6 +188,14 @@ sub _relationship_attrs {
     return \%composite;
 }
 
+sub _strip__id {
+    my ($self, $name) = @_;
+
+    $name =~ s/_(?:id|ref)\z//;
+
+    return $name;
+}
+
 sub _array_eq {
     my ($self, $a, $b) = @_;
 
@@ -213,9 +221,26 @@ sub _remote_attrs {
     return $attrs;
 }
 
+sub _sanitize_name {
+    my ($self, $name) = @_;
+
+    if (ref $name) {
+        # scalar ref for weird table name (like one containing a '.')
+        ($name = $$name) =~ s/\W+/_/g;
+    }
+    else {
+        # remove 'schema.' prefix if any
+        $name =~ s/^[^.]+\.//;
+    }
+
+    return $name;
+}
+
 sub _normalize_name {
     my ($self, $name) = @_;
 
+    $name = $self->_sanitize_name($name);
+
     my @words = split_name $name;
 
     return join '_', map lc, @words;
@@ -230,7 +255,7 @@ sub _remote_relname {
     if(scalar keys %{$cond} == 1) {
         my ($col) = values %{$cond};
         $col = $self->_normalize_name($col);
-        $col =~ s/_id$//;
+        $col = $self->_strip__id($col);
         $remote_relname = $self->_inflect_singular($col);
     }
     else {
@@ -325,7 +350,7 @@ sub _relnames_and_method {
         $remote_relname .= $colnames if keys %$cond > 1;
 
         $local_relname = $self->_normalize_name($local_table . $colnames);
-        $local_relname =~ s/_id$//;
+        $local_relname = $self->_strip__id($local_relname);
 
         $local_relname_uninflected = $local_relname;
         $local_relname = $self->_inflect_plural($local_relname);