Now passing four more tests, has_a and has_many compliance extended

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

diff --git a/lib/DBIx/Class/Table.pm b/lib/DBIx/Class/Table.pm
index 511f19b..56eea71 100644 (file)
--- a/lib/DBIx/Class/Table.pm
+++ b/lib/DBIx/Class/Table.pm
@@ -3,12 +3,14 @@ package DBIx::Class::Table;
 use strict;
 use warnings;
 
-use base qw/Class::Data::Inheritable Class::Accessor DBIx::Class::SQL/;
+use base qw/Class::Data::Inheritable DBIx::Class::SQL/;
 
 __PACKAGE__->mk_classdata('_columns' => {});
 
 __PACKAGE__->mk_classdata('_table_name');
 
+__PACKAGE__->mk_classdata('table_alias'); # FIXME XXX
+
 sub new {
   my ($class, $attrs) = @_;
   $class = ref $class if ref $class;
@@ -16,10 +18,9 @@ sub new {
   if ($attrs) {
     die "attrs must be a hashref" unless ref($attrs) eq 'HASH';
     while (my ($k, $v) = each %{$attrs}) {
-      $new->set($k => $v);
+      $new->store_column($k => $v);
     }
   }
-  $new->{_dirty_columns} = {};
   return $new;
 }
 
@@ -61,43 +62,46 @@ sub update {
 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->_where_from_hash($query);
+    my ($cond, @param) = $self->_cond_resolve($query, $attrs);
     my $sth = $self->_get_sth('delete', undef, $self->_table_name, $cond);
-    $sth->execute(@$param);
+    $sth->execute(@param);
     $sth->finish;
   }
   return $self;
 }
 
-sub discard_changes {
-  my ($self) = @_;
-  $_[0] = $self->retrieve($self->id);
-}
-
-sub get {
+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};
+  die "No such column '${column}'" unless $self->_columns->{$column};
   return $self->{_column_data}{$column} if $self->_columns->{$column};
-  return shift->SUPER::get(@_);
 }
 
-sub set {
+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;
-  if ($self->_columns->{$column}) {
-    $self->{_dirty_columns}{$column} = 1;
-    return $self->{_column_data}{$column} = $value;
-  }
-  return shift->SUPER::set(@_);
+  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 {
@@ -109,10 +113,10 @@ sub _register_columns {
 
 sub _mk_column_accessors {
   my ($class, @cols) = @_;
-  $class->mk_accessors(@cols);
+  $class->mk_group_accessors('column' => @cols);
 }
 
-sub set_columns {
+sub add_columns {
   my ($class, @cols) = @_;
   $class->_register_columns(@cols);
   $class->_mk_column_accessors(@cols);
@@ -123,30 +127,42 @@ sub retrieve_from_sql {
   $cond =~ s/^\s*WHERE//i;
   my @cols = $class->_select_columns;
   my $sth = $class->_get_sth( 'select', \@cols, $class->_table_name, $cond);
-  $sth->execute(@vals);
+  #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->set($_, shift @row) for @cols;
+    $new->store_column($_, shift @row) for @cols;
     $new->{_in_database} = 1;
-    $new->{_dirty_columns} = {};
     push(@found, $new);
   }
   return @found;
 }
 
 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});
+  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 $where    = ref $_[0] eq "HASH" ? shift: {@_};
-  my ($cond, $param)  = $class->_where_from_hash($where, { cmp => 'like' });
-  return $class->retrieve_from_sql($cond, @{$param});
+  my $attrs = { };
+  if (@_ > 1 && ref $_[$#_] eq 'HASH') {
+    $attrs = pop(@_);
+  }
+  return $class->search(@_, { %$attrs, cmp => 'LIKE' });
 }
 
 sub _select_columns {
@@ -156,19 +172,23 @@ sub _select_columns {
 sub copy {
   my ($self, $changes) = @_;
   my $new = bless({ _column_data => { %{$self->{_column_data}}} }, ref $self);
-  $new->set($_ => $changes->{$_}) for keys %$changes;
+  $new->set_column($_ => $changes->{$_}) for keys %$changes;
   return $new->insert;
 }
 
-sub _where_from_hash {
-  my ($self, $query, $opts) = @_;
-  my $op = $opts->{'cmp'} || '=';
+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 ]);
+  return ($cond, values %$query);
+}
+
+sub table {
+  shift->_table_name(@_);
 }
 
 1;