From: Peter Rabbitson Date: Tue, 9 Jun 2009 23:21:50 +0000 (+0000) Subject: Move as_query out of the cursor X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=47614763f0a3e390d6caea0be8e1bbee00198c49;p=dbsrgits%2FDBIx-Class-Historic.git Move as_query out of the cursor --- diff --git a/lib/DBIx/Class/ResultSet.pm b/lib/DBIx/Class/ResultSet.pm index 1586766..a4cc654 100644 --- a/lib/DBIx/Class/ResultSet.pm +++ b/lib/DBIx/Class/ResultSet.pm @@ -1925,7 +1925,10 @@ B: This feature is still experimental. =cut -sub as_query { return shift->cursor->as_query(@_) } +sub as_query { + my $self = shift; + return $self->result_source->storage->as_query($self); +} =head2 find_or_new diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm index 3f54e1a..ff18654 100644 --- a/lib/DBIx/Class/Storage/DBI.pm +++ b/lib/DBIx/Class/Storage/DBI.pm @@ -910,6 +910,40 @@ sub _prep_for_execute { return ($sql, \@bind); } +=head2 as_query + +=over 4 + +=item Arguments: none + +=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) + +=cut + +sub as_query { + my ($self, $rs) = @_; + + 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 ($sql, $bind) = $self->_prep_for_execute($op, $bind, $ident, [ $select, $cond, $order, $rows, $offset ]); + my ($sql, $bind) = $self->_prep_for_execute( + @args[0 .. 2], + [ @args[4 .. $#args] ], + ); + return \[ "($sql)", @{ $bind || [] }]; +} + sub _fix_bind_params { my ($self, @bind) = @_; diff --git a/lib/DBIx/Class/Storage/DBI/Cursor.pm b/lib/DBIx/Class/Storage/DBI/Cursor.pm index 5800113..bd2a20a 100644 --- a/lib/DBIx/Class/Storage/DBI/Cursor.pm +++ b/lib/DBIx/Class/Storage/DBI/Cursor.pm @@ -49,32 +49,6 @@ sub new { return bless ($new, $class); } -=head2 as_query - -=over 4 - -=item Arguments: none - -=item Return Value: \[ $sql, @bind ] - -=back - -Returns the SQL statement and bind vars associated with the invocant. - -=cut - -sub as_query { - my $self = shift; - - my $storage = $self->{storage}; - my $sql_maker = $storage->sql_maker; - local $sql_maker->{for}; - - my @args = $storage->_select_args(@{$self->{args}}); - my ($sql, $bind) = $storage->_prep_for_execute(@args[0 .. 2], [@args[4 .. $#args]]); - return \[ "($sql)", @{ $bind || [] }]; -} - =head2 next =over 4