X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FTable.pm;h=cce20eff18068ad7739859689d89fce3777336bc;hb=b8777a0d404d4ae4fb55473ae224ace5d0b71375;hp=9873ce42e65e4ff85bb535ab97d1068bf476316b;hpb=510ca9120ab2fea50a0852ee4ed6a13735ed7ebc;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Table.pm b/lib/DBIx/Class/Table.pm
index 9873ce4..cce20ef 100644
--- a/lib/DBIx/Class/Table.pm
+++ b/lib/DBIx/Class/Table.pm
@@ -3,104 +3,41 @@ package DBIx::Class::Table;
 use strict;
 use warnings;
 
-use base qw/Class::Data::Inheritable DBIx::Class::SQL/;
+use DBIx::Class::ResultSet;
+
+use base qw/DBIx::Class/;
 
 __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;
-}
+__PACKAGE__->mk_classdata('table_alias'); # FIXME: Doesn't actually do anything yet!
 
-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;
-}
+__PACKAGE__->mk_classdata('_resultset_class' => 'DBIx::Class::ResultSet');
 
-sub create {
-  my ($class, $attrs) = @_;
-  die "create needs a hashref" unless ref $attrs eq 'HASH';
-  return $class->new($attrs)->insert;
-}
+sub iterator_class { shift->_resultset_class(@_) }
 
-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;
-}
+=head1 NAME 
 
-sub delete {
-  my $self = shift;
-  if (ref $self) {
-    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 $query = (ref $_[0] eq 'HASH' ? $_[0] : {@_});
-    my ($cond, $param) = $self->_where_from_hash($query);
-    my $sth = $self->_get_sth('delete', undef, $self->_table_name, $cond);
-    $sth->execute(@$param);
-    $sth->finish;
-  }
-  return $self;
-}
+DBIx::Class::Table - Basic table methods
 
-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};
-}
+=head1 SYNOPSIS
 
-sub set_column {
-  my $self = shift;
-  my ($column) = @_;
-  my $ret = $self->store_column(@_);
-  $self->{_dirty_columns}{$column} = 1;
-  return $ret;
-}
+=head1 DESCRIPTION
 
-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;
-}
+This class is responsible for defining and doing table-level operations on 
+L<DBIx::Class> classes.
+
+=head1 METHODS
+
+=cut
 
 sub _register_columns {
   my ($class, @cols) = @_;
   my $names = { %{$class->_columns} };
-  $names->{$_} ||= {} for @cols;
+  while (my $col = shift @cols) {
+    $names->{$col} = (ref $cols[0] ? shift : {});
+  }
   $class->_columns($names); 
 }
 
@@ -109,72 +46,111 @@ sub _mk_column_accessors {
   $class->mk_group_accessors('column' => @cols);
 }
 
+=head2 add_columns
+
+  __PACKAGE__->add_columns(qw/col1 col2 col3/);
+
+Adds columns to the current class and creates accessors for them.
+
+=cut
+
 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);
-  return $class->sth_to_objects($sth, \@vals, \@cols);
+sub resultset_instance {
+  my $class = shift;
+  $class->next::method($class->construct_resultset);
 }
 
-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 construct_resultset {
+  my $class = shift;
+  my $rs_class = $class->_resultset_class;
+  eval "use $rs_class;";
+  return $rs_class->new($class);
 }
 
-sub search {
-  my $class    = shift;
-  my $where    = ref $_[0] eq "HASH" ? shift: {@_};
-  my ($cond, $param)  = $class->_where_from_hash($where);
-  return $class->retrieve_from_sql($cond, @{$param});
+sub _select_columns {
+  return keys %{$_[0]->_columns};
 }
 
-sub search_like {
-  my $class    = shift;
-  my $where    = ref $_[0] eq "HASH" ? shift: {@_};
-  my ($cond, $param)  = $class->_where_from_hash($where, { cmp => 'like' });
-  return $class->retrieve_from_sql($cond, @{$param});
+=head2 table
+
+  __PACKAGE__->table('tbl_name');
+  
+Gets or sets the table name.
+
+=cut
+
+sub table {
+  shift->_table_name(@_);
 }
 
-sub _select_columns {
-  return keys %{$_[0]->_columns};
+=head2 find_or_create
+
+  $class->find_or_create({ key => $val, ... });
+
+Searches for a record matching the search condition; if it doesn't find one,
+creates one and returns that instead.
+
+=cut
+
+sub find_or_create {
+  my $class    = shift;
+  my $hash     = ref $_[0] eq "HASH" ? shift: {@_};
+  my $exists = $class->find($hash);
+  return defined($exists) ? $exists : $class->create($hash);
 }
 
-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;
+=head2 has_column                                                                
+                                                                                
+  if ($obj->has_column($col)) { ... }                                           
+                                                                                
+Returns 1 if the class has a column of this name, 0 otherwise.                  
+                                                                                
+=cut                                                                            
+
+sub has_column {
+  my ($self, $column) = @_;
+  return exists $self->_columns->{$column};
 }
 
-sub _where_from_hash {
-  my ($self, $query, $opts) = @_;
-  my $op = $opts->{'cmp'} || '=';
-  my $cond = join(' AND ',
-               map { (defined $query->{$_}
-                       ? "$_ $op ?"
-                       : (do { delete $query->{$_}; "$_ IS NULL"; }));
-                   } keys %$query);
-  return ($cond, [ values %$query ]);
+=head2 column_info                                                               
+                                                                                
+  my $info = $obj->column_info($col);                                           
+                                                                                
+Returns the column metadata hashref for a column.
+                                                                                
+=cut                                                                            
+
+sub column_info {
+  my ($self, $column) = @_;
+  die "No such column $column" unless exists $self->_columns->{$column};
+  return $self->_columns->{$column};
 }
 
-sub table {
-  shift->_table_name(@_);
+=head2 columns                                                                   
+                                                                                
+  my @column_names = $obj->columns;                                             
+                                                                                
+=cut                                                                            
+
+sub columns {
+  die "columns() is a read-only accessor, did you mean add_columns()?" if (@_ > 1);
+  return keys %{shift->_columns};
 }
 
 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
+