X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Finflate%2Fhri.t;h=1a497d47779fe55e1d5c645c20009387857c14da;hb=1f870d5a08fa1794734380d7c8bd6753cdcf8f6d;hp=69fa4ff2be04385a8896b4f82ff3344dae80720a;hpb=e4e1b704b6e511c14410e721188e4115dc00f137;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/inflate/hri.t b/t/inflate/hri.t
index 69fa4ff..1a497d4 100644
--- a/t/inflate/hri.t
+++ b/t/inflate/hri.t
@@ -2,6 +2,7 @@ use strict;
 use warnings;
 
 use Test::More;
+use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 my $schema = DBICTest->init_schema();
@@ -9,28 +10,69 @@ my $schema = DBICTest->init_schema();
 # Under some versions of SQLite if the $rs is left hanging around it will lock
 # So we create a scope here cos I'm lazy
 {
-    my $rs = $schema->resultset('CD')->search ({}, { order_by => 'cdid' });
-
-    # get the defined columns
-    my @dbic_cols = sort $rs->result_source->columns;
-
-    # use the hashref inflator class as result class
-    $rs->result_class('DBIx::Class::ResultClass::HashRefInflator');
-
-    # fetch first record
-    my $datahashref1 = $rs->first;
-
-    my @hashref_cols = sort keys %$datahashref1;
-
-    is_deeply( \@dbic_cols, \@hashref_cols, 'returned columns' );
-
-    my $cd1 = $rs->find ({cdid => 1});
-    is_deeply ( $cd1, $datahashref1, 'first/find return the same thing');
+    my $rs = $schema->resultset('CD')->search ({}, {
+        order_by => 'cdid',
+    });
+
+    my $orig_resclass = $rs->result_class;
+    eval "package DBICTest::CDSubclass; use base '$orig_resclass'";
+
+# override on a specific $rs object, should not chain
+    $rs->result_class ('DBICTest::CDSubclass');
+
+    my $cd = $rs->find ({cdid => 1});
+    is (ref $cd, 'DBICTest::CDSubclass', 'result_class override propagates to find');
+
+    $cd = $rs->search({ cdid => 1 })->single;
+    is (ref $cd, $orig_resclass, 'result_class override does not propagate over seach+single');
+
+    $cd = $rs->search()->find ({ cdid => 1 });
+    is (ref $cd, $orig_resclass, 'result_class override does not propagate over seach+find');
+
+# set as attr - should propagate
+    my $hri_rs = $rs->search ({}, { result_class => 'DBIx::Class::ResultClass::HashRefInflator' });
+    is ($rs->result_class, 'DBICTest::CDSubclass', 'original class unchanged');
+    is ($hri_rs->result_class, 'DBIx::Class::ResultClass::HashRefInflator', 'result_class accessor pre-set via attribute');
+
+
+    my $datahashref1 = $hri_rs->next;
+    is_deeply(
+      [ sort keys %$datahashref1 ],
+      [ sort $rs->result_source->columns ],
+      'returned correct columns',
+    );
+
+    $cd = $hri_rs->find ({cdid => 1});
+    is_deeply ( $cd, $datahashref1, 'first/find return the same thing (result_class attr propagates)');
+
+    $cd = $hri_rs->search({ cdid => 1 })->single;
+    is_deeply ( $cd, $datahashref1, 'first/search+single return the same thing (result_class attr propagates)');
+
+    $hri_rs->result_class ('DBIx::Class::Row'); # something bogus
+    is(
+        $hri_rs->search->result_class, 'DBIx::Class::ResultClass::HashRefInflator',
+        'result_class set using accessor does not propagate over unused search'
+    );
+
+# test result class auto-loading
+    throws_ok (
+      sub { $rs->result_class ('nonexsitant_bogus_class') },
+      qr/Can't locate nonexsitant_bogus_class.pm/,
+      'Attempt to load on accessor override',
+    );
+    is ($rs->result_class, 'DBICTest::CDSubclass', 'class unchanged');
+
+    throws_ok (
+      sub { $rs->search ({}, { result_class => 'nonexsitant_bogus_class' }) },
+      qr/Can't locate nonexsitant_bogus_class.pm/,
+      'Attempt to load on accessor override',
+    );
+    is ($rs->result_class, 'DBICTest::CDSubclass', 'class unchanged');
 }
 
 sub check_cols_of {
     my ($dbic_obj, $datahashref) = @_;
-    
+
     foreach my $col (keys %$datahashref) {
         # plain column
         if (not ref ($datahashref->{$col}) ) {
@@ -44,14 +86,14 @@ sub check_cols_of {
         elsif (ref ($datahashref->{$col}) eq 'ARRAY') {
             my @dbic_reltable = $dbic_obj->$col;
             my @hashref_reltable = @{$datahashref->{$col}};
-  
+
             is (scalar @dbic_reltable, scalar @hashref_reltable, 'number of related entries');
 
             # for my $index (0..scalar @hashref_reltable) {
             for my $index (0..scalar @dbic_reltable) {
                 my $dbic_reltable_obj       = $dbic_reltable[$index];
                 my $hashref_reltable_entry  = $hashref_reltable[$index];
-                
+
                 check_cols_of($dbic_reltable_obj, $hashref_reltable_entry);
             }
         }
@@ -139,3 +181,4 @@ is_deeply(
 );
 
 done_testing;
+