More internals cleanup, separated out ResultSourceInstance from TableInstance

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

diff --git a/lib/DBIx/Class/TableInstance.pm b/lib/DBIx/Class/TableInstance.pm
index 4cb8d7f..6a44c84 100644 (file)
--- a/lib/DBIx/Class/TableInstance.pm
+++ b/lib/DBIx/Class/TableInstance.pm
@@ -3,17 +3,13 @@ package DBIx::Class::TableInstance;
 use strict;
 use warnings;
 
-use base qw/DBIx::Class/;
+use base qw/DBIx::Class::ResultSourceInstance/;
 use DBIx::Class::Table;
 
 __PACKAGE__->mk_classdata('table_alias'); # FIXME: Doesn't actually do anything yet!
 
 __PACKAGE__->mk_classdata('table_class' => 'DBIx::Class::Table');
 
-sub iterator_class { shift->result_source->resultset_class(@_) }
-sub resultset_class { shift->result_source->resultset_class(@_) }
-sub _table_name { shift->result_source->name }
-
 =head1 NAME 
 
 DBIx::Class::TableInstance - provides a classdata table object and method proxies
@@ -41,16 +37,6 @@ Adds columns to the current class and creates accessors for them.
 
 =cut
 
-sub add_columns {
-  my ($class, @cols) = @_;
-  $class->result_source->add_columns(@cols);
-  $class->_mk_column_accessors(@cols);
-}
-
-sub _select_columns {
-  return shift->result_source->columns;
-}
-
 =head2 table
 
   __PACKAGE__->table('tbl_name');
@@ -61,18 +47,18 @@ Gets or sets the table name.
 
 sub table {
   my ($class, $table) = @_;
-  return $class->result_source->name unless $table;
+  return $class->result_source_instance->name unless $table;
   unless (ref $table) {
     $table = $class->table_class->new(
       {
         name => $table,
         result_class => $class,
       });
-    if ($class->can('result_source')) {
-      $table->{_columns} = { %{$class->result_source->{_columns}||{}} };
+    if ($class->can('result_source_instance')) {
+      $table->{_columns} = { %{$class->result_source_instance->{_columns}||{}} };
     }
   }
-  $class->mk_classdata('result_source' => $table);
+  $class->mk_classdata('result_source_instance' => $table);
   if ($class->can('schema_instance')) {
     $class =~ m/([^:]+)$/;
     $class->schema_instance->register_class($class, $class);
@@ -87,11 +73,6 @@ Returns 1 if the class has a column of this name, 0 otherwise.
                                                                                 
 =cut                                                                            
 
-sub has_column {
-  my ($self, $column) = @_;
-  return $self->result_source->has_column($column);
-}
-
 =head2 column_info                                                               
                                                                                 
   my $info = $obj->column_info($col);                                           
@@ -100,24 +81,12 @@ Returns the column metadata hashref for a column.
                                                                                 
 =cut                                                                            
 
-sub column_info {
-  my ($self, $column) = @_;
-  return $self->result_source->column_info($column);
-}
-
 =head2 columns
 
   my @column_names = $obj->columns;                                             
                                                                                 
 =cut                                                                            
 
-sub columns {
-  return shift->result_source->columns(@_);
-}
-
-sub set_primary_key { shift->result_source->set_primary_key(@_); }
-sub primary_columns { shift->result_source->primary_columns(@_); }
-
 1;
 
 =head1 AUTHORS