[Bast-commits] r5779 - in DBIx-Class/0.08/trunk/lib/DBIx/Class: . CDBICompat

[robkinyon at dev.catalyst.perl.org]

Author: robkinyon
Date: 2009-03-19 21:07:06 +0000 (Thu, 19 Mar 2009)
New Revision: 5779

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/Retrieve.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
Log:
Commit another fix for arcanez to test

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/Retrieve.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/Retrieve.pm	2009-03-19 20:52:54 UTC (rev 5778)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/CDBICompat/Retrieve.pm	2009-03-19 21:07:06 UTC (rev 5779)
@@ -67,7 +67,7 @@
       $attrs{group_by} = $1;
   }
 
-  return $class->search_literal($cond, ( %attrs || () ) );
+  return $class->search_literal($cond, @rest, ( %attrs ? \%attrs : () ) );
 }
 
 sub construct {

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-03-19 20:52:54 UTC (rev 5778)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-03-19 21:07:06 UTC (rev 5779)
@@ -411,7 +411,11 @@
 
 sub search_literal {
   my ($self, $sql, @bind) = @_; 
-  return $self->search(\[ $sql, map [ __DUMMY__ => $_ ], @bind ]);
+  my $attr;
+  if ( @bind && ref($bind[-1]) eq 'HASH' ) {
+    $attr = pop @bind;
+  }
+  return $self->search(\[ $sql, map [ __DUMMY__ => $_ ], @bind ], ($attr || () ));
 }
 
 =head2 find