X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FTable.pm;h=49a9ffe82de1079c151a81fba8668efdac8fa425;hb=5efe4c7916e1fb2132c1b73ab4ddddbced317adb;hp=78a97bdb19101993d6e2c054ed42aab0041a0cfc;hpb=b8e1e21f0fcd55e6e3ce987e57601b279a75b666;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Table.pm b/lib/DBIx/Class/Table.pm
index 78a97bd..49a9ffe 100644
--- a/lib/DBIx/Class/Table.pm
+++ b/lib/DBIx/Class/Table.pm
@@ -3,190 +3,45 @@ package DBIx::Class::Table;
 use strict;
 use warnings;
 
-use base qw/Class::Data::Inheritable DBIx::Class::SQL/;
-
-__PACKAGE__->mk_classdata('_columns' => {});
-
-__PACKAGE__->mk_classdata('_table_name');
-
-sub new {
-  my ($class, $attrs) = @_;
-  $class = ref $class if ref $class;
-  my $new = bless({ _column_data => { } }, $class);
-  if ($attrs) {
-    die "attrs must be a hashref" unless ref($attrs) eq 'HASH';
-    while (my ($k, $v) = each %{$attrs}) {
-      $new->store_column($k => $v);
-    }
-  }
-  return $new;
-}
-
-sub insert {
-  my ($self) = @_;
-  return if $self->{_in_database};
-  my $sth = $self->_get_sth('insert', [ keys %{$self->{_column_data}} ],
-                              $self->_table_name, undef);
-  $sth->execute(values %{$self->{_column_data}});
-  $self->{_in_database} = 1;
-  $self->{_dirty_columns} = {};
-  return $self;
-}
-
-sub create {
-  my ($class, $attrs) = @_;
-  die "create needs a hashref" unless ref $attrs eq 'HASH';
-  return $class->new($attrs)->insert;
-}
-
-sub update {
-  my ($self) = @_;
-  die "Not in database" unless $self->{_in_database};
-  my @to_update = keys %{$self->{_dirty_columns} || {}};
-  return -1 unless @to_update;
-  my $sth = $self->_get_sth('update', \@to_update,
-                              $self->_table_name, $self->_ident_cond);
-  my $rows = $sth->execute( (map { $self->{_column_data}{$_} } @to_update),
-                  $self->_ident_values );
-  if ($rows == 0) {
-    die "Can't update $self: row not found";
-  } elsif ($rows > 1) {
-    die "Can't update $self: updated more than one row";
-  }
-  $self->{_dirty_columns} = {};
-  return $self;
-}
-
-sub delete {
-  my $self = shift;
-  if (ref $self) {
-    #warn $self->_ident_cond.' '.join(', ', $self->_ident_values);
-    my $sth = $self->_get_sth('delete', undef,
-                                $self->_table_name, $self->_ident_cond);
-    $sth->execute($self->_ident_values);
-    $sth->finish;
-    delete $self->{_in_database};
-  } else {
-    my $attrs = { };
-    if (@_ > 1 && ref $_[$#_] eq 'HASH') {
-      $attrs = { %{ pop(@_) } };
-    }
-    my $query = (ref $_[0] eq 'HASH' ? $_[0] : {@_});
-    my ($cond, @param) = $self->_cond_resolve($query, $attrs);
-    my $sth = $self->_get_sth('delete', undef, $self->_table_name, $cond);
-    $sth->execute(@param);
-    $sth->finish;
-  }
-  return $self;
-}
-
-sub get_column {
-  my ($self, $column) = @_;
-  die "Can't fetch data as class method" unless ref $self;
-  die "No such column '${column}'" unless $self->_columns->{$column};
-  return $self->{_column_data}{$column} if $self->_columns->{$column};
-}
-
-sub set_column {
-  my $self = shift;
-  my ($column) = @_;
-  my $ret = $self->store_column(@_);
-  $self->{_dirty_columns}{$column} = 1;
-  return $ret;
-}
-
-sub store_column {
-  my ($self, $column, $value) = @_;
-  die "No such column '${column}'" unless $self->_columns->{$column};
-  die "set_column called for ${column} without value" if @_ < 3;
-  return $self->{_column_data}{$column} = $value;
-}
-
-sub _register_columns {
-  my ($class, @cols) = @_;
-  my $names = { %{$class->_columns} };
-  $names->{$_} ||= {} for @cols;
-  $class->_columns($names); 
-}
-
-sub _mk_column_accessors {
-  my ($class, @cols) = @_;
-  $class->mk_group_accessors('column' => @cols);
-}
-
-sub add_columns {
-  my ($class, @cols) = @_;
-  $class->_register_columns(@cols);
-  $class->_mk_column_accessors(@cols);
-}
-
-sub retrieve_from_sql {
-  my ($class, $cond, @vals) = @_;
-  $cond =~ s/^\s*WHERE//i;
-  my @cols = $class->_select_columns;
-  my $sth = $class->_get_sth( 'select', \@cols, $class->_table_name, $cond);
-  #warn "$cond @vals";
-  return $class->sth_to_objects($sth, \@vals, \@cols);
-}
-
-sub sth_to_objects {
-  my ($class, $sth, $args, $cols) = @_;
-  my @cols = ((ref $cols eq 'ARRAY') ? @$cols : @{$sth->{NAME_lc}} );
-  $sth->execute(@$args);
-  my @found;
-  while (my @row = $sth->fetchrow_array) {
-    my $new = $class->new;
-    $new->store_column($_, shift @row) for @cols;
-    $new->{_in_database} = 1;
-    push(@found, $new);
-  }
-  return @found;
-}
-
-sub search {
-  my $class = shift;
-  my $attrs = { };
-  if (@_ > 1 && ref $_[$#_] eq 'HASH') {
-    $attrs = { %{ pop(@_) } };
-  }
-  my $query    = ref $_[0] eq "HASH" ? shift: {@_};
-  my ($cond, @param)  = $class->_cond_resolve($query, $attrs);
-  return $class->retrieve_from_sql($cond, @param);
-}
-
-sub search_like {
-  my $class    = shift;
-  my $attrs = { };
-  if (@_ > 1 && ref $_[$#_] eq 'HASH') {
-    $attrs = pop(@_);
-  }
-  return $class->search(@_, { %$attrs, cmp => 'LIKE' });
-}
-
-sub _select_columns {
-  return keys %{$_[0]->_columns};
-}
-
-sub copy {
-  my ($self, $changes) = @_;
-  my $new = bless({ _column_data => { %{$self->{_column_data}}} }, ref $self);
-  $new->set_column($_ => $changes->{$_}) for keys %$changes;
-  return $new->insert;
-}
-
-sub _cond_resolve {
-  my ($self, $query, $attrs) = @_;
-  my $op = $attrs->{'cmp'} || '=';
-  my $cond = join(' AND ',
-               map { (defined $query->{$_}
-                       ? "$_ $op ?"
-                       : (do { delete $query->{$_}; "$_ IS NULL"; }));
-                   } keys %$query);
-  return ($cond, values %$query);
-}
-
-sub table {
-  shift->_table_name(@_);
-}
+use DBIx::Class::ResultSet;
+
+use Carp qw/croak/;
+
+use base qw/DBIx::Class/;
+__PACKAGE__->load_components(qw/ResultSource AccessorGroup/);
+
+__PACKAGE__->mk_group_accessors('simple' =>
+  qw/_columns _primaries name resultset_class result_class schema/);
+
+=head1 NAME 
+
+DBIx::Class::Table - Table object
+
+=head1 SYNOPSIS
+
+=head1 DESCRIPTION
+
+Table object that inherits from L<DBIx::Class::ResultSource>
+
+=head1 METHODS
+
+=head2 from
+
+Returns the FROM entry for the table (i.e. the table name)
+
+=cut
+
+sub from { shift->name; }
 
 1;
+
+=head1 AUTHORS
+
+Matt S. Trout <mst@shadowcatsystems.co.uk>
+
+=head1 LICENSE
+
+You may distribute this code under the same terms as Perl itself.
+
+=cut
+