@@ -459,7 +459,7 @@ sub update {
$obj->call_trigger('post_save', $orig_obj);
$obj->call_trigger('post_update', $orig_obj);
- $orig_obj->changed_colums({});
+ $orig_obj->changed_columns({});
return $rows;
}
lib/Data/ObjectDriver/Driver/DBI.pm
@@ -24,9 +24,9 @@ use warnings;
use Moose ();
use Moose::Exporter;
use Moose::Util::MetaRole;
+use Data::ObjectDriver::Role::Object;
use Data::ObjectDriver::Moose::Base;
use Data::ObjectDriver::Role::Meta::Class;
-use Data::ObjectDriver::Role::Object;
Moose::Exporter->setup_import_methods(
with_caller => [ 'columns', 'datasource', 'driver', 'primary_key' ],
lib/Data/ObjectDriver/Moose.pm
@@ -3,9 +3,16 @@ use Carp;
use Moose::Role;
use Moose::Util::TypeConstraints;
-my $has_changed = sub {
- my ($instance, $value) = @_;
- warn "Changing $instance to $value";
+sub after_has_changed {
+ my $attr = shift;
+ return sub {
+ my ($instance, $value) = @_;
+ #warn "Changing $instance $attr to $value";
+ # ugly
+ my $changed_columns = $instance->changed_columns || {};
+ $changed_columns->{$attr}++;
+ $instance->changed_columns($changed_columns);
+ }
};
sub set_columns {
@@ -22,7 +29,7 @@ sub set_columns {
my %except = map { $_ => 1 } @{ $_[1] || [] };
my %attributes = %{ $caller->meta->get_attribute_map };
for (keys %attributes) {
- $meta->add_after_method_modifier( $_, sub { warn "AFTER"} );
+ $meta->add_after_method_modifier( $_, after_has_changed($_) );
}
my @columns = grep { ! $except{$_} } keys %attributes;
$meta->columns( \@columns );
lib/Data/ObjectDriver/Role/Meta/Class.pm
@@ -11,8 +11,8 @@ use Carp ();
use Data::ObjectDriver::ResultSet;
has changed_columns => (
- is => 'rw',
- isa => 'HashRef',
+ is => 'rw',
+ isa => 'HashRef',
default => sub { {} },
);
@@ -541,7 +541,7 @@ sub inflate {
my($deflated) = @_;
my $obj = $class->new;
$obj->set_values($deflated->{columns});
- $obj->{changed_cols} = {};
+ $obj->changed_columns({});
$obj->call_trigger('post_inflate');
return $obj;
}
lib/Data/ObjectDriver/Role/Object.pm
@@ -33,7 +33,7 @@ setup_dbs({
{
my $w = Wine->new;
ok $w->name("name");
- use YAML; warn Dump [$w->primary_key_tuple];
+ ok $w->is_changed('name');
dies_ok { $w->inexistent("hell") } "dies on setting inexistent column : 'inexistent()'";
}
@@ -186,8 +186,7 @@ setup_dbs({
#$r->refresh;
my $id = $r->recipe_id;
$r->title('replaced');
- $r->recipe_id("lamer");
- dies_ok { $r->replace };
+ dies_ok { $r->recipe_id("lamer") };
$r = Recipe->lookup($id);
ok $r;
is $r->title, "to replace";
@@ -197,8 +196,7 @@ setup_dbs({
no warnings 'redefine';
local *Data::ObjectDriver::Driver::DBD::SQLite::can_replace = sub { 0 };
$r->title('replaced');
- $r->recipe_id("lamer");
- dies_ok { $r->replace };
+ dies_ok { $r->recipe_id("lamer") };
$r = Recipe->lookup($id);
ok $r;
is $r->title, "to replace";
t/02-moose.t
@@ -5,7 +5,7 @@ use Moose::Util::TypeConstraints;
subtype 'vchar'
=> as Str
- => where { defined($_) && bytes::length($_) < 255 }
+ => where { use bytes; defined($_) && bytes::length($_) < 255 }
=> message { "The vchar you provided shouldn't exceed 255 char" };
has id => ( isa => 'Int', is => 'rw' );
t/lib/moose/Ingredient.pm
c4f28b13920e768470d20fe15b1cf9ced5ef69f8
Yann Kerherve
yann@cyberion.net
http://github.com/yannk/perl-data-objectdriver/commit/610820d7c11b6c6e2706681905a861e428b41898
610820d7c11b6c6e2706681905a861e428b41898
2009-04-06T14:42:51-07:00
2009-04-06T14:42:51-07:00
Very ugly but works now, thanks to the help I got from #moose
8facdf47c17ebbde0a5f1a6e89bc63f8f4e45a2c
Yann Kerherve
yann@cyberion.net