better 'on_connect_do' parsing in helper, release

diff --git a/Changes b/Changes
index c84401c..de73d5c 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Model::DBIC::Schema
 
+0.39  Mon Feb  1 10:08:51 EST 2010
+        - better 'on_connect_do' parsing in Helper
+
 0.38  Fri Jan 15 06:41:24 EST 2010
         - re-add the 'storage' proxy method
 

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index 86be7c7..0508a58 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.39';
 $VERSION = eval $VERSION;
 
 use Carp;
@@ -488,7 +488,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}";
 }

diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm
index b04eedb..9cded57 100644 (file)
--- a/lib/Catalyst/Model/DBIC/Schema.pm
+++ b/lib/Catalyst/Model/DBIC/Schema.pm
@@ -5,7 +5,7 @@ use mro 'c3';
 extends 'Catalyst::Model';
 with 'CatalystX::Component::Traits';
 
-our $VERSION = '0.38';
+our $VERSION = '0.39';
 $VERSION = eval $VERSION;
 
 use namespace::autoclean;