X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FHelper%2FModel%2FDBIC%2FSchema.pm;h=d10e76a0457158aded89e0b37f7493d5805f9665;hb=4f907946f731283a5b498dccd893bd14939b2b10;hp=b61e01230771370968e9f6a9b491977ea790abef;hpb=7e6a622c0a3c3a14e677913b7cd8b7d640e1d6e3;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 b61e012..d10e76a 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.36';
+our $VERSION = '0.42';
 $VERSION = eval $VERSION;
 
 use Carp;
@@ -265,6 +265,7 @@ sub _parse_loader_args {
 
     %result = (
         relationships => 1,
+        use_moose => 1,
         (!$self->old_schema ? (
                 use_namespaces => 1
             ) : ()),
@@ -488,7 +489,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}";
 }