Major overhaul of select/as resolution handling (fixes RT#61235)

[dbsrgits/DBIx-Class.git] / t / 91merge_joinpref_attr.t

diff --git a/t/91merge_attr.t b/t/91merge_joinpref_attr.t
similarity index 80%
rename from t/91merge_attr.t
rename to t/91merge_joinpref_attr.t
index 6699150..17b40ca 100644 (file)
--- a/t/91merge_attr.t
+++ b/t/91merge_joinpref_attr.t
@@ -15,7 +15,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = 'artist';
   my $b = 'cd';
   my $expected = [ 'artist', 'cd' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -23,7 +23,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist' ];
   my $b = [ 'cd' ];
   my $expected = [ 'artist', 'cd' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -31,7 +31,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd' ];
   my $b = [ 'cd' ];
   my $expected = [ 'artist', 'cd' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -39,7 +39,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'artist' ];
   my $b = [ 'artist', 'cd' ];
   my $expected = [ 'artist', 'artist', 'cd' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -47,7 +47,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd' ];
   my $b = [ 'artist', 'artist' ];
   my $expected = [ 'artist', 'cd', 'artist' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -55,7 +55,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'twokeys' ];
   my $b = [ 'cds', 'cds' ];
   my $expected = [ 'twokeys', 'cds', 'cds' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -63,7 +63,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = 'artist';
   my $expected = [ 'artist', 'cd', { 'artist' => 'manager' } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -71,7 +71,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = [ 'artist', 'cd' ];
   my $expected = [ 'artist', 'cd', { 'artist' => 'manager' } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -79,7 +79,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = { 'artist' => 'manager' };
   my $expected = [ 'artist', 'cd', { 'artist' => [ 'manager' ] } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -87,7 +87,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = { 'artist' => 'agent' };
   my $expected = [ { 'artist' => 'agent' }, 'cd', { 'artist' => 'manager' } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -95,7 +95,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = { 'artist' => { 'manager' => 'artist' } };
   my $expected = [ 'artist', 'cd', { 'artist' => [ { 'manager' => 'artist' } ] } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -103,7 +103,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = { 'artist' => { 'manager' => [ 'artist', 'label' ] } };
   my $expected = [ 'artist', 'cd', { 'artist' => [ { 'manager' => [ 'artist', 'label' ] } ] } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -111,7 +111,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd', { 'artist' => 'manager' } ];
   my $b = { 'artist' => { 'tour_manager' => [ 'venue', 'roadie' ] } };
   my $expected = [ { 'artist' => { 'tour_manager' => [ 'venue', 'roadie' ] } }, 'cd', { 'artist' =>  'manager' } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -119,7 +119,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ 'artist', 'cd' ];
   my $b = { 'artist' => { 'tour_manager' => [ 'venue', 'roadie' ] } };
   my $expected = [ { 'artist' => { 'tour_manager' => [ 'venue', 'roadie' ] } }, 'cd' ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }
 
@@ -127,7 +127,7 @@ my $rs = $schema->resultset( 'CD' );
   my $a = [ { 'artist' => 'manager' }, 'cd' ];
   my $b = [ 'artist', { 'artist' => 'manager' } ];
   my $expected = [ { 'artist' => 'manager' }, 'cd', { 'artist' => 'manager' } ];
-  my $result = $rs->_merge_attr($a, $b);
+  my $result = $rs->_merge_joinpref_attr($a, $b);
   is_deeply( $result, $expected );
 }