X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FLazyLoading.pm;h=6a33eff2393d3c3a96ca800a8282be8206967222;hb=73f581237f9fb7bf1e0233e50530321fb7f5d6e1;hp=ed6153517cc0b0afde1d013a8c33a02c0e58e5ac;hpb=fe5d862bdaa631796cb26e5fea232a81458e68f8;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/CDBICompat/LazyLoading.pm b/lib/DBIx/Class/CDBICompat/LazyLoading.pm
index ed61535..6a33eff 100644
--- a/lib/DBIx/Class/CDBICompat/LazyLoading.pm
+++ b/lib/DBIx/Class/CDBICompat/LazyLoading.pm
@@ -10,7 +10,7 @@ sub _select_columns {
 sub get_column {
   my ($self, $col) = @_;
   if ((ref $self) && (!exists $self->{'_column_data'}{$col})
-    && $self->{'_in_database'}) {
+    && $self->{'_in_storage'}) {
     $self->_flesh(grep { exists $self->_column_groups->{$_}{$col}
                            && $_ ne 'All' }
                    keys %{ $self->_column_groups || {} });
@@ -20,13 +20,17 @@ sub get_column {
 
 sub _flesh {
   my ($self, @groups) = @_;
+  @groups = ('All') unless @groups;
   my %want;
   $want{$_} = 1 for map { keys %{$self->_column_groups->{$_}} } @groups;
   if (my @want = grep { !exists $self->{'_column_data'}{$_} } keys %want) {
-    my $sth = $self->_get_sth('select', \@want, $self->_table_name,
-                                $self->_ident_cond); 
-    $sth->execute($self->_ident_values);
-    my @val = $sth->fetchrow_array;
+    my $cursor = $self->storage->select($self->_table_name, \@want,
+                \$self->_ident_cond, { bind => [ $self->_ident_values ] });
+    #my $sth = $self->storage->select($self->_table_name, \@want,
+    #                                   $self->ident_condition);
+    # Not sure why the first one works and this doesn't :(
+    my @val = $cursor->next;
+#warn "Flesh: ".join(', ', @want, '=>', @val);
     foreach my $w (@want) {
       $self->{'_column_data'}{$w} = shift @val;
     }