[Bast-commits] r8221 - in branches/DBIx-Class-Schema-Loader/current: . lib/DBIx/Class/Schema/Loader

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-01-02 05:55:35 +0000 (Sat, 02 Jan 2010)
New Revision: 8221

Modified:
   branches/DBIx-Class-Schema-Loader/current/TODO-BACKCOMPAT
   branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
Log:
fix old class replace regex, new TODO

Modified: branches/DBIx-Class-Schema-Loader/current/TODO-BACKCOMPAT
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/TODO-BACKCOMPAT	2010-01-02 05:01:34 UTC (rev 8220)
+++ branches/DBIx-Class-Schema-Loader/current/TODO-BACKCOMPAT	2010-01-02 05:55:35 UTC (rev 8221)
@@ -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

Modified: branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm
===================================================================
--- branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm	2010-01-02 05:01:34 UTC (rev 8220)
+++ branches/DBIx-Class-Schema-Loader/current/lib/DBIx/Class/Schema/Loader/Base.pm	2010-01-02 05:55:35 UTC (rev 8221)
@@ -601,14 +601,14 @@
             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,