From: Peter Rabbitson <ribasushi@cpan.org>
Date: Mon, 27 Oct 2008 17:27:40 +0000 (+0000)
Subject: dirty_column detection in set_column() should not depend on the (undocumented) return... 
X-Git-Tag: v0.08240~300
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1d0057bd70e7846100004b3fd918168a852ac6f6;p=dbsrgits%2FDBIx-Class.git

dirty_column detection in set_column() should not depend on the (undocumented) return value of store_column()
---

diff --git a/lib/DBIx/Class/Row.pm b/lib/DBIx/Class/Row.pm
index 3e0bf64..f7b33cc 100644
--- a/lib/DBIx/Class/Row.pm
+++ b/lib/DBIx/Class/Row.pm
@@ -518,18 +518,19 @@ appropriate.
 =cut
 
 sub set_column {
-  my $self = shift;
-  my ($column) = @_;
+  my ($self, $column, $new_value) = @_;
+
   $self->{_orig_ident} ||= $self->ident_condition;
-  my $old = $self->get_column($column);
-  my $ret = $self->store_column(@_);
+  my $old_value = $self->get_column($column);
+
+  $self->store_column($column, $new_value);
   $self->{_dirty_columns}{$column} = 1
-    if (defined $old xor defined $ret) || (defined $old && $old ne $ret);
+    if (defined $old_value xor defined $new_value) || (defined $old_value && $old_value ne $new_value);
 
   # XXX clear out the relation cache for this column
   delete $self->{related_resultsets}{$column};
 
-  return $ret;
+  return $new_value;
 }
 
 =head2 set_columns
diff --git a/t/85utf8.t b/t/85utf8.t
index 8ef3bda..438bd85 100644
--- a/t/85utf8.t
+++ b/t/85utf8.t
@@ -16,7 +16,7 @@ if ($] <= 5.008000) {
     eval 'use utf8; 1' or plan skip_all => 'Need utf8 run this test';
 }
 
-plan tests => 3;
+plan tests => 5;
 
 DBICTest::Schema::CD->load_components('UTF8Columns');
 DBICTest::Schema::CD->utf8_columns('title');
@@ -43,3 +43,13 @@ if ($] <= 5.008000) {
     $cd->title($utf8_char);
     ok( !utf8::is_utf8( $cd->{_column_data}{title} ), 'store utf8-less chars' );
 }
+
+my $v_utf8 = "\x{219}";
+
+$cd->update ({ title => $v_utf8 });
+$cd->title($v_utf8);
+ok( !$cd->is_column_changed('title'), 'column is not dirty after setting the same unicode value' );
+
+$cd->update ({ title => $v_utf8 });
+$cd->title('something_else');
+ok( $cd->is_column_changed('title'), 'column is dirty after setting to something completely different');