X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FCDBICompat%2FLazyLoading.pm;h=e07579a3fe89abe89ee3b48de15a0054fde1bed3;hb=9901aad73ff9dc45b426534fe406c102fb9fb77c;hp=b3d18e913a4314ae4df17ef295396963f0e6d40f;hpb=c0fcc63f9a95819d353c5640ad2cc8d2b956ad63;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/CDBICompat/LazyLoading.pm b/lib/DBIx/Class/CDBICompat/LazyLoading.pm index b3d18e9..e07579a 100644 --- a/lib/DBIx/Class/CDBICompat/LazyLoading.pm +++ b/lib/DBIx/Class/CDBICompat/LazyLoading.pm @@ -20,13 +20,38 @@ sub update { my @dirty_columns = keys %{$self->{_dirty_columns}}; my $ret = $self->next::method(@_); - - delete $self->{_column_data}{$_} for @dirty_columns; + $self->_clear_column_data(@dirty_columns); return $ret; } +# And again for create +sub create { + my $class = shift; + my($data) = @_; + + my @columns = keys %$data; + + my $obj = $class->next::method(@_); + return $obj unless defined $obj; + + my %primary_cols = map { $_ => 1 } $class->primary_columns; + my @data_cols = grep !$primary_cols{$_}, @columns; + $obj->_clear_column_data(@data_cols); + + return $obj; +} + + +sub _clear_column_data { + my $self = shift; + + delete $self->{_column_data}{$_} for @_; + delete $self->{_inflated_column}{$_} for @_; +} + + sub get_column { my ($self, $col) = @_; if ((ref $self) && (!exists $self->{'_column_data'}{$col}) @@ -78,7 +103,9 @@ sub _flesh { # $self->ident_condition); # Not sure why the first one works and this doesn't :( my @val = $cursor->next; -#warn "Flesh: ".join(', ', @want, '=>', @val); + + return unless @val; # object must have been deleted from the database + foreach my $w (@want) { $self->{'_column_data'}{$w} = shift @val; }