Renamed DBIx::Class::PK's retrieve() as find()

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

diff --git a/lib/DBIx/Class/Table.pm b/lib/DBIx/Class/Table.pm
index 0123aef..144826f 100644 (file)
--- a/lib/DBIx/Class/Table.pm
+++ b/lib/DBIx/Class/Table.pm
@@ -248,29 +248,28 @@ sub add_columns {
   $class->_mk_column_accessors(@cols);
 }
 
-=item retrieve_from_sql
+=item search_literal
 
-  my @obj    = $class->retrieve_from_sql($sql_where_cond, @bind);
-  my $cursor = $class->retrieve_from_sql($sql_where_cond, @bind);
+  my @obj    = $class->search_literal($literal_where_cond, @bind);
+  my $cursor = $class->search_literal($literal_where_cond, @bind);
 
 =cut
 
-sub retrieve_from_sql {
+sub search_literal {
   my ($class, $cond, @vals) = @_;
   $cond =~ s/^\s*WHERE//i;
-  my $attrs = (ref $vals[$#vals] eq 'HASH' ? pop(@vals) : {});
-  my @cols = $class->_select_columns($attrs);
-  #warn "@cols $cond @vals";
-  return $class->cursor_to_resultset(undef, \@vals, \@cols, { where => \$cond, %$attrs });
+  my $attrs = (ref $vals[$#vals] eq 'HASH' ? { %{ pop(@vals) } } : {});
+  $attrs->{bind} = \@vals;
+  return $class->search(\$cond, $attrs);
 }
 
-=item count_from_sql
+=item count_literal
 
-  my $count = $class->count($sql_where_cond);
+  my $count = $class->count_literal($literal_where_cond);
 
 =cut
 
-sub count_from_sql {
+sub count_literal {
   my ($class, $cond, @vals) = @_;
   $cond =~ s/^\s*WHERE//i;
   my $attrs = (ref $vals[$#vals] eq 'HASH' ? pop(@vals) : {});
@@ -327,7 +326,7 @@ sub search {
   if (@_ > 1 && ref $_[$#_] eq 'HASH') {
     $attrs = { %{ pop(@_) } };
   }
-  my $query    = ref $_[0] eq "HASH" ? shift: {@_};
+  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 });
@@ -418,17 +417,6 @@ sub insert_or_update {
   return ($self->in_database ? $self->update : $self->insert);
 }
 
-=item retrieve_all
-
-  my @all = $class->retrieve_all;
-
-=cut
-
-sub retrieve_all {
-  my ($class) = @_;
-  return $class->retrieve_from_sql( '1' );
-}
-
 =item is_changed
 
   my @changed_col_names = $obj->is_changed