X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FTable.pm;h=42631ded9ac97b3ceac7719394d56b4698d6ae4d;hb=fab31d8c753ec27ee5b5a16d1568cc337a245858;hp=aa85c7c4edc7d6105bf26bbcdf2344ca9d9ea442;hpb=944f30bf240a360b7963247945916c6388321b3d;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Table.pm b/lib/DBIx/Class/Table.pm
index aa85c7c..42631de 100644
--- a/lib/DBIx/Class/Table.pm
+++ b/lib/DBIx/Class/Table.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use DBIx::Class::ResultSet;
+use Data::Page;
 
 use base qw/Class::Data::Inheritable/;
 
@@ -32,196 +33,8 @@ L<DBIx::Class> objects.
 
 =over 4
 
-=item new
-
-  my $obj = My::Class->new($attrs);
-
-Creates a new object from column => value mappings passed as a hash ref
-
-=cut
-
-sub new {
-  my ($class, $attrs) = @_;
-  $class = ref $class if ref $class;
-  my $new = bless({ _column_data => { } }, $class);
-  if ($attrs) {
-    $new->throw("attrs must be a hashref" ) unless ref($attrs) eq 'HASH';
-    while (my ($k, $v) = each %{$attrs}) {
-      $new->store_column($k => $v);
-    }
-  }
-  return $new;
-}
-
-=item insert
-
-  $obj->insert;
-
-Inserts an object into the database if it isn't already in there. Returns
-the object itself.
-
-=cut
-
-sub insert {
-  my ($self) = @_;
-  return $self if $self->in_storage;
-  #use Data::Dumper; warn Dumper($self);
-  my %in;
-  $in{$_} = $self->get_column($_)
-    for grep { defined $self->get_column($_) } $self->columns;
-  my %out = %{ $self->storage->insert($self->_table_name, \%in) };
-  $self->store_column($_, $out{$_})
-    for grep { $self->get_column($_) ne $out{$_} } keys %out;
-  $self->in_storage(1);
-  $self->{_dirty_columns} = {};
-  return $self;
-}
-
-=item in_storage
-
-  $obj->in_storage; # Get value
-  $obj->in_storage(1); # Set value
-
-Indicated whether the object exists as a row in the database or not
-
-=cut
-
-sub in_storage {
-  my ($self, $val) = @_;
-  $self->{_in_storage} = $val if @_ > 1;
-  return $self->{_in_storage};
-}
-
-=item create
-
-  my $new = My::Class->create($attrs);
-
-A shortcut for My::Class->new($attrs)->insert;
-
-=cut
-
-sub create {
-  my ($class, $attrs) = @_;
-  $class->throw( "create needs a hashref" ) unless ref $attrs eq 'HASH';
-  return $class->new($attrs)->insert;
-}
-
-=item update
-
-  $obj->update;
-
-Must be run on an object that is already in the database; issues an SQL
-UPDATE query to commit any changes to the object to the db if required.
-
 =cut
 
-sub update {
-  my ($self, $upd) = @_;
-  $self->throw( "Not in database" ) unless $self->in_storage;
-  my %to_update = %{$upd || {}};
-  $to_update{$_} = $self->get_column($_) for $self->is_changed;
-  return -1 unless keys %to_update;
-  my $rows = $self->storage->update($self->_table_name, \%to_update,
-                                      $self->ident_condition);
-  if ($rows == 0) {
-    $self->throw( "Can't update ${self}: row not found" );
-  } elsif ($rows > 1) {
-    $self->throw("Can't update ${self}: updated more than one row");
-  }
-  $self->{_dirty_columns} = {};
-  return $self;
-}
-
-sub ident_condition {
-  my ($self) = @_;
-  my %cond;
-  $cond{$_} = $self->get_column($_) for keys %{$self->_primaries};
-  return \%cond;
-}
-
-=item delete
-
-  $obj->delete
-
-Deletes the object from the database. The object is still perfectly usable
-accessor-wise etc. but ->in_storage will now return 0 and the object must
-be re ->insert'ed before it can be ->update'ed
-
-=cut
-
-sub delete {
-  my $self = shift;
-  if (ref $self) {
-    $self->throw( "Not in database" ) unless $self->in_storage;
-    #warn $self->_ident_cond.' '.join(', ', $self->_ident_values);
-    $self->storage->delete($self->_table_name, $self->ident_condition);
-    $self->in_storage(undef);
-    #$self->store_column($_ => undef) for $self->primary_columns;
-      # Should probably also arrange to trash PK if auto
-      # but if we do, post-delete cascade triggers fail :/
-  } else {
-    my $attrs = { };
-    if (@_ > 1 && ref $_[$#_] eq 'HASH') {
-      $attrs = { %{ pop(@_) } };
-    }
-    my $query = (ref $_[0] eq 'HASH' ? $_[0] : {@_});
-    $self->storage->delete($self->_table_name, $query);
-  }
-  return $self;
-}
-
-=item get_column
-
-  my $val = $obj->get_column($col);
-
-Fetches a column value
-
-=cut
-
-sub get_column {
-  my ($self, $column) = @_;
-  $self->throw( "Can't fetch data as class method" ) unless ref $self;
-  $self->throw( "No such column '${column}'" ) unless $self->_columns->{$column};
-  return $self->{_column_data}{$column}
-    if exists $self->{_column_data}{$column};
-  return undef;
-}
-
-=item set_column
-
-  $obj->set_column($col => $val);
-
-Sets a column value; if the new value is different to the old the column
-is marked as dirty for when you next call $obj->update
-
-=cut
-
-sub set_column {
-  my $self = shift;
-  my ($column) = @_;
-  my $old = $self->get_column($column);
-  my $ret = $self->store_column(@_);
-  $self->{_dirty_columns}{$column} = 1 unless defined $old && $old eq $ret;
-  return $ret;
-}
-
-=item store_column
-
-  $obj->store_column($col => $val);
-
-Sets a column value without marking it as dirty
-
-=cut
-
-sub store_column {
-  my ($self, $column, $value) = @_;
-  $self->throw( "No such column '${column}'" ) 
-    unless $self->_columns->{$column};
-  $self->throw( "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} };
@@ -270,11 +83,8 @@ sub search_literal {
 =cut
 
 sub count_literal {
-  my ($class, $cond, @vals) = @_;
-  $cond =~ s/^\s*WHERE//i;
-  my $attrs = (ref $vals[$#vals] eq 'HASH' ? pop(@vals) : {});
-  $attrs->{bind} = [ @vals ];
-  return $class->count($cond, $attrs);
+  my $class = shift;
+  return $class->search_literal(@_)->count;
 }
 
 =item count
@@ -285,31 +95,7 @@ sub count_literal {
 
 sub count {
   my $class = shift;
-  my $attrs = { };
-  if (@_ > 1 && ref $_[$#_] eq 'HASH') {
-    $attrs = { %{ pop(@_) } };
-  }
-  my $query    = (@_ == 1 || ref $_[0] eq "HASH" ? shift: {@_});
-  my @cols = 'COUNT(*)';
-  my $cursor = $class->storage->select($class->_table_name, \@cols,
-                                         $query, $attrs);
-  return ($cursor->next)[0];
-}
-
-sub cursor_to_resultset {
-  my ($class, $sth, $args, $cols, $attrs) = @_;
-  my $rs_class = $class->_resultset_class;
-  eval "use $rs_class;";
-  my $rs = $rs_class->new($class, $sth, $args, $cols, $attrs);
-  return (wantarray ? $rs->all : $rs);
-}
-
-sub _row_to_object { # WARNING: Destructive to @$row
-  my ($class, $cols, $row) = @_;
-  my $new = $class->new;
-  $new->store_column($_, shift @$row) for @$cols;
-  $new->in_storage(1);
-  return $new;
+  return $class->search(@_)->count;
 }
 
 =item search 
@@ -326,10 +112,19 @@ sub search {
   if (@_ > 1 && ref $_[$#_] eq 'HASH') {
     $attrs = { %{ pop(@_) } };
   }
-  my $query    = (@_ == 1 || ref $_[0] eq "HASH" ? shift: {@_});
-  my @cols = $class->_select_columns;
-  return $class->cursor_to_resultset(undef, $attrs->{bind}, \@cols,
-                                    { where => $query, %$attrs });
+  $attrs->{where} = (@_ == 1 || ref $_[0] eq "HASH" ? shift: {@_});
+  
+  my $rs = $class->resultset($attrs);
+  
+  return (wantarray ? $rs->all : $rs);
+}
+
+sub resultset {
+  my $class = shift;
+
+  my $rs_class = $class->_resultset_class;
+  eval "use $rs_class;";
+  my $rs = $rs_class->new($class, @_);
 }
 
 =item search_like
@@ -353,31 +148,6 @@ sub _select_columns {
   return keys %{$_[0]->_columns};
 }
 
-=item copy
-
-  my $copy = $orig->copy({ change => $to, ... });
-
-=cut
-
-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) = @_;
-#  return '1 = 1' unless keys %$query;
-#  my $op = $attrs->{'cmp'} || '=';
-#  my $cond = join(' AND ',
-#               map { (defined $query->{$_}
-#                       ? "$_ $op ?"
-#                       : (do { delete $query->{$_}; "$_ IS NULL"; }));
-#                   } keys %$query);
-#  return ($cond, values %$query);
-#}
-
 =item table
 
   __PACKAGE__->table('tbl_name');
@@ -400,33 +170,10 @@ creates one and returns that instead
 sub find_or_create {
   my $class    = shift;
   my $hash     = ref $_[0] eq "HASH" ? shift: {@_};
-  my ($exists) = $class->search($hash);
+  my $exists = $class->find($hash);
   return defined($exists) ? $exists : $class->create($hash);
 }
 
-=item insert_or_update
-
-  $obj->insert_or_update
-
-Updates the object if it's already in the db, else inserts it
-
-=cut
-
-sub insert_or_update {
-  my $self = shift;
-  return ($self->in_storage ? $self->update : $self->insert);
-}
-
-=item is_changed
-
-  my @changed_col_names = $obj->is_changed
-
-=cut
-
-sub is_changed {
-  return keys %{shift->{_dirty_columns} || {}};
-}
-
 sub columns { return keys %{shift->_columns}; }
 
 1;
@@ -435,7 +182,7 @@ sub columns { return keys %{shift->_columns}; }
 
 =head1 AUTHORS
 
-Matt S. Trout <perl-stuff@trout.me.uk>
+Matt S. Trout <mst@shadowcatsystems.co.uk>
 
 =head1 LICENSE