X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FRetrieve.pm;h=1186ae4583a76066e5c474e55a18af4356ea15d0;hb=0d865134b6803a02047846e1709ecb3989fd1c66;hp=58a39d4dc19c8cf1dc2f8bb9629ba72a5d2d2dac;hpb=19e3ec11e0527341c483fff1a79b7f16dc6e15c2;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/Retrieve.pm b/lib/DBIx/Class/CDBICompat/Retrieve.pm
index 58a39d4..1186ae4 100644
--- a/lib/DBIx/Class/CDBICompat/Retrieve.pm
+++ b/lib/DBIx/Class/CDBICompat/Retrieve.pm
@@ -1,13 +1,58 @@
-package DBIx::Class::CDBICompat::Retrieve;
+package # hide from PAUSE
+    DBIx::Class::CDBICompat::Retrieve;
 
 use strict;
 use warnings FATAL => 'all';
 
-sub retrieve          { shift->find(@_)            }
-sub retrieve_all      { shift->search_literal('1', @_) }
-sub retrieve_from_sql { shift->search_literal(@_)  }
 
-sub count_all          { shift->count_literal('1')  }
+sub retrieve {
+  my $self = shift;
+  die "No args to retrieve" unless @_ > 0;
+
+  my @cols = $self->primary_columns;
+
+  my $query;
+  if (ref $_[0] eq 'HASH') {
+    $query = { %{$_[0]} };
+  }
+  elsif (@_ == @cols) {
+    $query = {};
+    @{$query}{@cols} = @_;
+  }
+  else {
+    $query = {@_};
+  }
+
+  $query = $self->_build_query($query);
+  $self->find($query);
+}
+
+sub find_or_create {
+  my $self = shift;
+  my $query = ref $_[0] eq 'HASH' ? shift : {@_};
+
+  $query = $self->_build_query($query);
+  $self->next::method($query);
+}
+
+# _build_query
+#
+# Build a query hash. Defaults to a no-op; ColumnCase overrides.
+
+sub _build_query {
+  my ($self, $query) = @_;
+
+  return $query;
+}
+
+sub retrieve_from_sql {
+  my ($class, $cond, @rest) = @_;
+  $cond =~ s/^\s*WHERE//i;
+  $class->search_literal($cond, @rest);
+}
+
+sub retrieve_all      { shift->search              }
+sub count_all         { shift->count               }
   # Contributed by Numa. No test for this though.
 
 1;