Fixes, refactoring, test additions

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Schema.pm

diff --git a/lib/DBIx/Class/Schema.pm b/lib/DBIx/Class/Schema.pm
index bdd157b..d704d82 100644 (file)
--- a/lib/DBIx/Class/Schema.pm
+++ b/lib/DBIx/Class/Schema.pm
@@ -6,7 +6,7 @@ use warnings;
 use base qw/Class::Data::Inheritable/;
 use base qw/DBIx::Class/;
 
-__PACKAGE__->load_components(qw/Exception/);
+__PACKAGE__->load_components(qw/Exception Componentised/);
 __PACKAGE__->mk_classdata('class_registrations' => {});
 
 =head1 NAME
@@ -81,12 +81,26 @@ sub load_classes {
 
 sub compose_connection {
   my ($class, $target, @info) = @_;
-  $class->setup_connection_class($target, @info);
+  my $conn_class = "${target}::_db";
+  $class->setup_connection_class($conn_class, @info);
   my %reg = %{ $class->class_registrations };
+  my %target;
+  my %map;
   while (my ($comp, $comp_class) = each %reg) {
     my $target_class = "${target}::${comp}";
-    $class->inject_base($target_class, $comp_class, $target);
+    $class->inject_base($target_class, $conn_class, $comp_class);
+    $target_class->table($comp_class->table);
+    @map{$comp, $comp_class} = ($target_class, $target_class);
   }
+  {
+    no strict 'refs';
+    *{"${target}::class"} =
+      sub {
+        my ($class, $to_map) = @_;
+        return $map{$to_map};
+      };
+  }
+  $conn_class->class_resolver($target);
 }
 
 sub setup_connection_class {
@@ -96,21 +110,13 @@ sub setup_connection_class {
   $target->connection(@info);
 }
 
-sub inject_base {
-  my ($class, $target, @to_inject) = @_;
-  {
-    no strict 'refs';
-    unshift(@{"${target}::ISA"}, @to_inject);
-  }
-}
-
 1;
 
 =back
 
 =head1 AUTHORS
 
-Matt S. Trout <perl-stuff@trout.me.uk>
+Matt S. Trout <mst@shadowcatsystems.co.uk>
 
 =head1 LICENSE