X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FTable.pm;h=49a9ffe82de1079c151a81fba8668efdac8fa425;hb=8452e496adea0c57b81f413e11b2f5b5b6e62c5c;hp=717e52275e5e95795b5d13f66e664e385a07954c;hpb=fea3d0452969e98afc0296ba80f90a91ab7dc1be;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Table.pm b/lib/DBIx/Class/Table.pm
index 717e522..49a9ffe 100644
--- a/lib/DBIx/Class/Table.pm
+++ b/lib/DBIx/Class/Table.pm
@@ -8,10 +8,10 @@ use DBIx::Class::ResultSet;
 use Carp qw/croak/;
 
 use base qw/DBIx::Class/;
-__PACKAGE__->load_components(qw/AccessorGroup/);
+__PACKAGE__->load_components(qw/ResultSource AccessorGroup/);
 
 __PACKAGE__->mk_group_accessors('simple' =>
-  qw/_columns _primaries name resultset_class result_class storage/);
+  qw/_columns _primaries name resultset_class result_class schema/);
 
 =head1 NAME 
 
@@ -21,127 +21,17 @@ DBIx::Class::Table - Table object
 
 =head1 DESCRIPTION
 
-This class is responsible for defining and doing table-level operations on 
-L<DBIx::Class> classes.
+Table object that inherits from L<DBIx::Class::ResultSource>
 
 =head1 METHODS
 
-=cut
-
-sub new {
-  my ($class, $attrs) = @_;
-  $class = ref $class if ref $class;
-  my $new = bless({ %{$attrs || {}} }, $class);
-  $new->{resultset_class} ||= 'DBIx::Class::ResultSet';
-  $new->{_columns} ||= {};
-  $new->{name} ||= "!!NAME NOT SET!!";
-  return $new;
-}
-
-sub add_columns {
-  my ($self, @cols) = @_;
-  while (my $col = shift @cols) {
-    $self->_columns->{$col} = (ref $cols[0] ? shift : {});
-  }
-}
-
-*add_column = \&add_columns;
-
-=head2 add_columns
-
-  $table->add_columns(qw/col1 col2 col3/);
-
-  $table->add_columns('col1' => \%col1_info, 'col2' => \%col2_info, ...);
-
-Adds columns to the table object. If supplied key => hashref pairs uses
-the hashref as the column_info for that column.
-
-=head2 add_column
-
-  $table->add_column('col' => \%info?);
-
-Convenience alias to add_columns
-
-=cut
-
-sub resultset {
-  my $self = shift;
-  return $self->{resultset} ||= $self->resultset_class->new($self);
-}
-
-=head2 has_column                                                                
-                                                                                
-  if ($obj->has_column($col)) { ... }                                           
-                                                                                
-Returns 1 if the table has a column of this name, 0 otherwise.                  
-                                                                                
-=cut                                                                            
-
-sub has_column {
-  my ($self, $column) = @_;
-  return exists $self->_columns->{$column};
-}
-
-=head2 column_info                                                               
-                                                                                
-  my $info = $obj->column_info($col);                                           
-                                                                                
-Returns the column metadata hashref for a column.
-                                                                                
-=cut                                                                            
-
-sub column_info {
-  my ($self, $column) = @_;
-  croak "No such column $column" unless exists $self->_columns->{$column};
-  return $self->_columns->{$column};
-}
-
-=head2 columns
-
-  my @column_names = $obj->columns;                                             
-                                                                                
-=cut                                                                            
-
-sub columns {
-  croak "columns() is a read-only accessor, did you mean add_columns()?" if (@_ > 1);
-  return keys %{shift->_columns};
-}
-
-=head2 set_primary_key(@cols)                                                   
-                                                                                
-Defines one or more columns as primary key for this table. Should be            
-called after C<add_columns>.
-                                                                                
-=cut                                                                            
-
-sub set_primary_key {
-  my ($self, @cols) = @_;
-  # check if primary key columns are valid columns
-  for (@cols) {
-    $self->throw("No such column $_ on table ".$self->name)
-      unless $self->has_column($_);
-  }
-  $self->_primaries(\@cols);
-}
-
-=head2 primary_columns                                                          
-                                                                                
-Read-only accessor which returns the list of primary keys.
-                                                                                
-=cut                                                                            
-
-sub primary_columns {
-  return @{shift->_primaries||[]};
-}
-
 =head2 from
 
 Returns the FROM entry for the table (i.e. the table name)
 
 =cut
 
-sub from { return shift->name(@_); }
-
+sub from { shift->name; }
 
 1;