[Catalyst-commits] r12648 - in Catalyst-Model-DBIC-Schema/trunk: . lib/Catalyst/Helper/Model/DBIC lib/Catalyst/Model/DBIC

[caelum at dev.catalyst.perl.org]

Author: caelum
Date: 2010-01-14 14:25:20 +0000 (Thu, 14 Jan 2010)
New Revision: 12648

Modified:
   Catalyst-Model-DBIC-Schema/trunk/Changes
   Catalyst-Model-DBIC-Schema/trunk/Makefile.PL
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm
   Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm
Log:
upgrading a schema to use_namespaces=1 will also turn on components=InflateColumn::DateTime (the default.), and release

Modified: Catalyst-Model-DBIC-Schema/trunk/Changes
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/Changes	2010-01-14 10:28:57 UTC (rev 12647)
+++ Catalyst-Model-DBIC-Schema/trunk/Changes	2010-01-14 14:25:20 UTC (rev 12648)
@@ -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
 

Modified: Catalyst-Model-DBIC-Schema/trunk/Makefile.PL
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/Makefile.PL	2010-01-14 10:28:57 UTC (rev 12647)
+++ Catalyst-Model-DBIC-Schema/trunk/Makefile.PL	2010-01-14 14:25:20 UTC (rev 12648)
@@ -4,17 +4,6 @@
 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';

Modified: Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm	2010-01-14 10:28:57 UTC (rev 12647)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Helper/Model/DBIC/Schema.pm	2010-01-14 14:25:20 UTC (rev 12648)
@@ -4,7 +4,7 @@
 use Moose;
 no warnings 'uninitialized';
 
-our $VERSION = '0.35';
+our $VERSION = '0.36';
 $VERSION = eval $VERSION;
 
 use Carp;
@@ -249,8 +249,10 @@
             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 @@
 
     %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_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;

Modified: Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm
===================================================================
--- Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm	2010-01-14 10:28:57 UTC (rev 12647)
+++ Catalyst-Model-DBIC-Schema/trunk/lib/Catalyst/Model/DBIC/Schema.pm	2010-01-14 14:25:20 UTC (rev 12648)
@@ -5,7 +5,7 @@
 extends 'Catalyst::Model';
 with 'CatalystX::Component::Traits';
 
-our $VERSION = '0.35';
+our $VERSION = '0.36';
 $VERSION = eval $VERSION;
 
 use namespace::autoclean;