Strip trailing _id from single-column belongs_to relationships

diff --git a/Changes b/Changes
index cffb452..4435ccd 100644 (file)
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Revision history for Perl extension DBIx::Class::Schema::Loader
 
 0.04999_06 Not Yet Released
         - Singularise table monikers by default
+        - Strip trailing _id from single-column belongs_to relationships
 
 0.04999_05 Mon Apr 14, 2008
         - Fix limiting table list to the specified schema for DB2

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index ab2e20d..e969bae 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -170,10 +170,11 @@ sub generate_code {
         my $remote_relname;
 
         # for single-column case, set the remote relname to the column
-        # name, to make filter accessors work
+        # name, to make filter accessors work, but strip trailing _id
         if(scalar keys %cond == 1) {
-            my ($col) = keys %cond;
-            $remote_relname = $self->_inflect_singular($cond{$col});
+            my ($col) = values %cond;
+            $col =~ s/_id$//;
+            $remote_relname = $self->_inflect_singular($col);
         }
         else {
             $remote_relname = $self->_inflect_singular(lc $remote_table);

diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm
index c34f368..135d1a8 100644 (file)
--- a/t/lib/dbixcsl_common_tests.pm
+++ b/t/lib/dbixcsl_common_tests.pm
@@ -401,7 +401,7 @@ sub test_schema {
         isa_ok( $obj6->loader_test2, $class2);
         isa_ok( $obj6->loader_test5, $class5);
 
-        ok($class6->column_info('loader_test2')->{is_foreign_key}, 'Foreign key detected');
+        ok($class6->column_info('loader_test2_id')->{is_foreign_key}, 'Foreign key detected');
         ok($class6->column_info('id')->{is_foreign_key}, 'Foreign key detected');
         ok($class6->column_info('id2')->{is_foreign_key}, 'Foreign key detected');
 
@@ -753,14 +753,14 @@ sub create {
             CREATE TABLE loader_test6 (
                 id INTEGER NOT NULL PRIMARY KEY,
                 Id2 INTEGER,
-                loader_test2 INTEGER,
+                loader_test2_id INTEGER,
                 dat VARCHAR(8),
-                FOREIGN KEY (loader_test2)  REFERENCES loader_test2 (id),
+                FOREIGN KEY (loader_test2_id)  REFERENCES loader_test2 (id),
                 FOREIGN KEY(id,Id2) REFERENCES loader_test5 (id1,iD2)
             ) $self->{innodb}
         },
 
-        (q{ INSERT INTO loader_test6 (id, id2,loader_test2,dat) } .
+        (q{ INSERT INTO loader_test6 (id, id2,loader_test2_id,dat) } .
          q{ VALUES (1, 1,1,'aaa') }),
 
         qq{