[Bast-commits] r7228 - in DBIx-Class/0.08/trunk: lib/DBIx/Class lib/DBIx/Class/Manual lib/DBIx/Class/ResultSource lib/DBIx/Class/ResultSourceProxy t/lib/DBICTest/Schema

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-08-05 13:41:28 +0000 (Wed, 05 Aug 2009)
New Revision: 7228

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Manual/Cookbook.pod
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource/View.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSourceProxy/Table.pm
   DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year1999CDs.pm
   DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year2000CDs.pm
Log:
Dynamically load necessary table classes

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Manual/Cookbook.pod
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Manual/Cookbook.pod	2009-08-05 12:57:52 UTC (rev 7227)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Manual/Cookbook.pod	2009-08-05 13:41:28 UTC (rev 7228)
@@ -111,8 +111,6 @@
   use warnings;
   use base qw/DBIx::Class/;
 
-  use DBIx::Class::ResultSource::View;
-
   __PACKAGE__->load_components('Core');
   __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
 

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource/View.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource/View.pm	2009-08-05 12:57:52 UTC (rev 7227)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource/View.pm	2009-08-05 13:41:28 UTC (rev 7228)
@@ -20,7 +20,6 @@
   package MyDB::Schema::Result::Year2000CDs;
 
   use base qw/DBIx::Class/;
-  use DBIx::Class::ResultSource::View;
 
   __PACKAGE__->load_components('Core');
   __PACKAGE__->table_class('DBIx::Class::ResultSource::View');

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2009-08-05 12:57:52 UTC (rev 7227)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSource.pm	2009-08-05 13:41:28 UTC (rev 7228)
@@ -40,8 +40,6 @@
   # Create a query (view) based result source, in a result class
   package MyDB::Schema::Result::Year2000CDs;
 
-  use DBIx::Class::ResultSource::View;
-
   __PACKAGE__->load_components('Core');
   __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
 

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSourceProxy/Table.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSourceProxy/Table.pm	2009-08-05 12:57:52 UTC (rev 7227)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSourceProxy/Table.pm	2009-08-05 13:41:28 UTC (rev 7228)
@@ -5,8 +5,6 @@
 
 use base qw/DBIx::Class::ResultSourceProxy/;
 
-use DBIx::Class::ResultSource::Table;
-
 __PACKAGE__->mk_classdata(table_class => 'DBIx::Class::ResultSource::Table');
 
 __PACKAGE__->mk_classdata('table_alias'); # FIXME: Doesn't actually do
@@ -22,8 +20,11 @@
     my $class_has_table_instance = ($table and $table->result_class eq $class);
     return $table if $class_has_table_instance;
 
+    my $table_class = $class->table_class;
+    $class->ensure_class_loaded($table_class);
+
     if( $table ) {
-        $table = $class->table_class->new({
+        $table = $table_class->new({
             %$table,
             result_class => $class,
             source_name => undef,
@@ -31,7 +32,7 @@
         });
     }
     else {
-        $table = $class->table_class->new({
+        $table = $table_class->new({
             name            => undef,
             result_class    => $class,
             source_name     => undef,
@@ -76,7 +77,11 @@
   my ($class, $table) = @_;
   return $class->result_source_instance->name unless $table;
   unless (ref $table) {
-    $table = $class->table_class->new({
+
+    my $table_class = $class->table_class;
+    $class->ensure_class_loaded($table_class);
+
+    $table = $table_class->new({
         $class->can('result_source_instance') ?
           %{$class->result_source_instance||{}} : (),
         name => $table,

Modified: DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year1999CDs.pm
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year1999CDs.pm	2009-08-05 12:57:52 UTC (rev 7227)
+++ DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year1999CDs.pm	2009-08-05 13:41:28 UTC (rev 7228)
@@ -3,7 +3,6 @@
 ## Used in 104view.t
 
 use base qw/DBICTest::BaseResult/;
-use DBIx::Class::ResultSource::View;
 
 __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
 

Modified: DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year2000CDs.pm
===================================================================
--- DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year2000CDs.pm	2009-08-05 12:57:52 UTC (rev 7227)
+++ DBIx-Class/0.08/trunk/t/lib/DBICTest/Schema/Year2000CDs.pm	2009-08-05 13:41:28 UTC (rev 7228)
@@ -3,7 +3,6 @@
 ## Used in 104view.t
 
 use base qw/DBICTest::BaseResult/;
-use DBIx::Class::ResultSource::View;
 
 __PACKAGE__->table_class('DBIx::Class::ResultSource::View');