[Bast-commits] r6581 - in DBIx-Class/0.08/trunk/lib/DBIx/Class: . Storage

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2009-06-09 23:27:19 +0000 (Tue, 09 Jun 2009)
New Revision: 6581

Modified:
   DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
   DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
Log:
Think before commit

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-06-09 23:21:50 UTC (rev 6580)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/ResultSet.pm	2009-06-09 23:27:19 UTC (rev 6581)
@@ -1927,7 +1927,7 @@
 
 sub as_query {
   my $self = shift;
-  return $self->result_source->storage->as_query($self);
+  return $self->result_source->storage->as_query($self->_resolved_attrs);
 }
 
 =head2 find_or_new

Modified: DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm
===================================================================
--- DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2009-06-09 23:21:50 UTC (rev 6580)
+++ DBIx-Class/0.08/trunk/lib/DBIx/Class/Storage/DBI.pm	2009-06-09 23:27:19 UTC (rev 6581)
@@ -914,27 +914,25 @@
 
 =over 4
 
-=item Arguments: none
+=item Arguments: $rs_attrs
 
 =item Return Value: \[ $sql, @bind ]
 
 =back
 
 Returns the SQL statement and bind vars that would result from the given
-ResultSet (does not actually run a query)
+ResultSet attributes (does not actually run a query)
 
 =cut
 
 sub as_query {
-  my ($self, $rs) = @_;
+  my ($self, $rs_attr) = @_;
 
   my $sql_maker = $self->sql_maker;
   local $sql_maker->{for};
 
-  my $attr = $rs->_resolved_attrs;
-
   # my ($op, $bind, $ident, $bind_attrs, $select, $cond, $order, $rows, $offset) = $self->_select_args(...);
-  my @args = $self->_select_args($attr->{from}, $attr->{select}, $attr->{where}, $attr);
+  my @args = $self->_select_args($rs_attr->{from}, $rs_attr->{select}, $rs_attr->{where}, $rs_attr);
 
   # my ($sql, $bind) = $self->_prep_for_execute($op, $bind, $ident, [ $select, $cond, $order, $rows, $offset ]);
   my ($sql, $bind) = $self->_prep_for_execute(