[Bast-commits] r3354 - in branches/DBIx-Class-current: . lib/DBIx/Class t

[claco at dev.catalyst.perl.org]

Author: claco
Date: 2007-05-22 01:32:35 +0100 (Tue, 22 May 2007)
New Revision: 3354

Modified:
   branches/DBIx-Class-current/Changes
   branches/DBIx-Class-current/lib/DBIx/Class/Row.pm
   branches/DBIx-Class-current/t/60core.t
Log:
added get_inflated_columns to Row


Modified: branches/DBIx-Class-current/Changes
===================================================================
--- branches/DBIx-Class-current/Changes	2007-05-21 23:47:56 UTC (rev 3353)
+++ branches/DBIx-Class-current/Changes	2007-05-22 00:32:35 UTC (rev 3354)
@@ -11,6 +11,7 @@
         - resultset_class/result_class now (again) auto loads the specified
           class; requires Class::Accessor::Grouped 0.05002+
         - added 97result_class.t test, failing ATM
+        - added get_inflated_columns to Row
 
 0.07006 2007-04-17 23:18:00
         - Lots of documentation updates

Modified: branches/DBIx-Class-current/lib/DBIx/Class/Row.pm
===================================================================
--- branches/DBIx-Class-current/lib/DBIx/Class/Row.pm	2007-05-21 23:47:56 UTC (rev 3353)
+++ branches/DBIx-Class-current/lib/DBIx/Class/Row.pm	2007-05-22 00:32:35 UTC (rev 3354)
@@ -292,6 +292,22 @@
            keys %{$self->{_dirty_columns}};
 }
 
+=head2 get_inflated_columns
+
+  my $inflated_data = $obj->get_inflated_columns;
+
+Similar to get_columns but objects are returned for inflated columns instead of their raw non-inflated values.
+
+=cut
+
+sub get_inflated_columns {
+  my $self = shift;
+  return map {
+    my $accessor = $self->column_info($_)->{'accessor'} || $_;
+    ($_ => $self->$accessor);
+  } $self->columns;
+}
+
 =head2 set_column
 
   $obj->set_column($col => $val);

Modified: branches/DBIx-Class-current/t/60core.t
===================================================================
--- branches/DBIx-Class-current/t/60core.t	2007-05-21 23:47:56 UTC (rev 3353)
+++ branches/DBIx-Class-current/t/60core.t	2007-05-22 00:32:35 UTC (rev 3354)
@@ -7,7 +7,7 @@
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 64;
+plan tests => 74;
 
 # figure out if we've got a version of sqlite that is older than 3.2.6, in
 # which case COUNT(DISTINCT()) doesn't work
@@ -175,6 +175,14 @@
 $new->update_or_insert;
 is( $schema->resultset("Track")->find(100)->pos, 5, 'update_or_insert update ok');
 
+# get_inflated_columns w/relation and accessor alias
+my %tdata = $new->get_inflated_columns;
+is($tdata{'trackid'}, 100, 'got id');
+isa_ok($tdata{'cd'}, 'DBICTest::CD', 'cd is CD object');
+is($tdata{'cd'}->id, 1, 'cd object is id 1');
+is($tdata{'position'}, 5, 'got position from pos');
+is($tdata{'title'}, 'Insert or Update');
+
 eval { $schema->class("Track")->load_components('DoesNotExist'); };
 
 ok $@, $@;
@@ -306,3 +314,14 @@
   ok(! exists $schema->source('CD')->_columns->{'year'}, 'year still exists in _columns');
 }
 
+# test get_inflated_columns with objects
+{
+    my $event = $schema->resultset('Event')->search->first;
+    my %edata = $event->get_inflated_columns;
+    is($edata{'id'}, $event->id, 'got id');
+    isa_ok($edata{'starts_at'}, 'DateTime', 'start_at is DateTime object');
+    isa_ok($edata{'created_on'}, 'DateTime', 'create_on DateTime object');
+    is($edata{'starts_at'}, $event->starts_at, 'got start date');
+    is($edata{'created_on'}, $event->created_on, 'got created date');
+}
+