fix old class replace regex, new TODO

diff --git a/TODO-BACKCOMPAT b/TODO-BACKCOMPAT
index 08eda1c..17a46d3 100644 (file)
--- a/TODO-BACKCOMPAT
+++ b/TODO-BACKCOMPAT
@@ -1,5 +1,8 @@
 SL Backcompat Plan:
 
+* rewrite un-singularized class names (in e.g. custom relationships) in both
+  preserved custom content and external content from un-singularized classes
+
 * make use_namespaces the default, and upgrade to it properly
 
 *** Catalyst Helper

diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm
index 39bb01d..5b334ff 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Base.pm
+++ b/lib/DBIx/Class/Schema/Loader/Base.pm
@@ -601,14 +601,14 @@ EOF
             my $code = do {
                 local ($/, @ARGV) = (undef, $old_real_inc_path); <>
             };
-            $code =~ s/$old_class/$class/g;
+            $code =~ s/\b$old_class\b/$class/g;
             eval $code;
             die $@ if $@;
         }
 
         while(<$fh>) {
             chomp;
-            s/$old_class/$class/g;
+            s/\b$old_class\b/$class/g;
             $self->_ext_stmt($class, $_);
         }
         $self->_ext_stmt($class,