added col_collision_map => 'column_%s' as default loader option

[catagits/Catalyst-Model-DBIC-Schema.git] / lib / Catalyst / Helper / Model / DBIC / Schema.pm

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index 86be7c7..5acd3bb 100644 (file)
--- 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.38';
+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}";
 }