X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper%2FModel%2FDBIC%2FSchema.pm;h=5acd3bbf5ab32ebb07d1fa3c123b12aee9a934f6;hb=f027951457db12f7cf47523e8620d1d758d47a79;hp=c177a30a13da0a7c985620a2d6d73252b92bcdba;hpb=626adb9c4591e540d675d6927903b82515712394;p=catagits%2FCatalyst-Model-DBIC-Schema.git

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index c177a30..5acd3bb 100644
--- a/lib/Catalyst/Helper/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
@@ -4,7 +4,7 @@ use namespace::autoclean;
 use Moose;
 no warnings 'uninitialized';
 
-our $VERSION = '0.37';
+our $VERSION = '0.43';
 $VERSION = eval $VERSION;
 
 use Carp;
@@ -265,6 +265,8 @@ sub _parse_loader_args {
 
     %result = (
         relationships => 1,
+        use_moose => 1,
+        col_collision_map => 'column_%s',
         (!$self->old_schema ? (
                 use_namespaces => 1
             ) : ()),
@@ -488,7 +490,7 @@ sub _eval {
 
     return $code if looks_like_number $code;
 
-    return $code if $code =~ m{^[\w;:/]*\z};
+    return $code if not $self->_is_struct($code);
 
     return eval "{no strict; $code}";
 }