upgrading a schema to use_namespaces=1 will also turn on components=InflateColumn...

diff --git a/Changes b/Changes
index 33abb12..8772d91 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Catalyst::Model::DBIC::Schema
 
+0.36  Thu Jan 14 09:21:10 EST 2010
+        - upgrading a schema to use_namespaces=1 will also turn on
+          components=InflateColumn::DateTime (the default.)
+
 0.35  Sun Dec 27 04:50:53 EST 2009
         - forgot to edit Changes on last upload
 

diff --git a/Makefile.PL b/Makefile.PL
index 4eedcbd..eba03a1 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,17 +4,6 @@ name 'Catalyst-Model-DBIC-Schema';
 perl_version 5.008001;
 all_from 'lib/Catalyst/Model/DBIC/Schema.pm';
 
-warn <<EOF;
-****************************** !!! WARNING !!!  *******************************
-*                                                                             *
-* Automatic proxying to the Schema class has been DISABLED.                   *
-*                                                                             *
-* See "METHOD PROXYING" in perldoc Catalyst::Model::DBIC::Schema for how to   *
-* turn it back on.                                                            *
-*                                                                             *
-*******************************************************************************
-EOF
-
 requires 'DBIx::Class'           => '0.08114';
 requires 'Catalyst::Runtime'     => '5.80005';
 requires 'CatalystX::Component::Traits' => '0.14';

diff --git a/lib/Catalyst/Helper/Model/DBIC/Schema.pm b/lib/Catalyst/Helper/Model/DBIC/Schema.pm
index 65735a8..b61e012 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.35';
+our $VERSION = '0.36';
 $VERSION = eval $VERSION;
 
 use Carp;
@@ -249,8 +249,10 @@ sub _parse_loader_args {
             if $@;
     }
 
-    my @components =
-    $self->_build_loader_components(delete $loader_args{components});
+    my @components = $self->_build_loader_components(
+        delete $loader_args{components},
+        $loader_args{use_namespaces},
+    );
 
     $self->components(\@components);
 
@@ -263,13 +265,13 @@ sub _parse_loader_args {
 
     %result = (
         relationships => 1,
-        (%loader_args ? %loader_args : ()),
         (!$self->old_schema ? (
                 use_namespaces => 1
             ) : ()),
         (@components ? (
                 components => \@components
-            ) : ())
+            ) : ()),
+        (%loader_args ? %loader_args : ()),
     );
 
     $self->loader_args(\%result);
@@ -316,9 +318,10 @@ sub _build_helper_loader_args {
 }
 
 sub _build_loader_components {
-    my ($self, $components) = @_;
+    my ($self, $components, $use_namespaces) = @_;
 
-    my @components = $self->old_schema ? () : ('InflateColumn::DateTime');
+    my @components = $self->old_schema && (not $use_namespaces) ? ()
+        : ('InflateColumn::DateTime');
 
     if ($components) {
         $components = [ $components ] if !ref $components;

diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm
index d5e1b39..59447f6 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.35';
+our $VERSION = '0.36';
 $VERSION = eval $VERSION;
 
 use namespace::autoclean;