Fix inexplicable 5.8.x C3 errors - roll back e6efde04

[dbsrgits/DBIx-Class.git] / t / lib / DBICTest / Schema / Track.pm

diff --git a/t/lib/DBICTest/Schema/Track.pm b/t/lib/DBICTest/Schema/Track.pm
index c27ba98..ef3b14d 100644 (file)
--- a/t/lib/DBICTest/Schema/Track.pm
+++ b/t/lib/DBICTest/Schema/Track.pm
@@ -1,8 +1,19 @@
 package # hide from PAUSE
     DBICTest::Schema::Track;
 
-use base qw/DBICTest::BaseResult/;
-__PACKAGE__->load_components(qw/InflateColumn::DateTime Ordered/);
+use warnings;
+use strict;
+
+use base 'DBICTest::BaseResult';
+use DBICTest::Util 'check_customcond_args';
+
+# The component order is Part of a test,
+# important to remain as-is
+__PACKAGE__->load_components(qw{
+    +DBICTest::DeployComponent
+    InflateColumn::DateTime
+    Ordered
+});
 
 __PACKAGE__->table('track');
 __PACKAGE__->add_columns(
@@ -39,10 +50,34 @@ __PACKAGE__->add_unique_constraint([ qw/cd title/ ]);
 __PACKAGE__->position_column ('position');
 __PACKAGE__->grouping_column ('cd');
 
-
+# the undef condition in this rel is *deliberate*
+# tests oddball legacy syntax
 __PACKAGE__->belongs_to( cd => 'DBICTest::Schema::CD', undef, {
     proxy => { cd_title => 'title' },
 });
+# custom condition coderef
+__PACKAGE__->belongs_to( cd_cref_cond => 'DBICTest::Schema::CD',
+sub {
+  # This is for test purposes only. A regular user does not
+  # need to sanity check the passed-in arguments, this is what
+  # the tests are for :)
+  my $args = &check_customcond_args;
+
+  return (
+    {
+      "$args->{foreign_alias}.cdid" => { -ident => "$args->{self_alias}.cd" },
+    },
+
+    ! $args->{self_result_object} ? () : {
+     "$args->{foreign_alias}.cdid" => $args->{self_result_object}->get_column('cd')
+    },
+
+    ! $args->{foreign_values} ? () : {
+     "$args->{self_alias}.cd" => $args->{foreign_values}{cdid}
+    },
+  );
+}
+);
 __PACKAGE__->belongs_to( disc => 'DBICTest::Schema::CD' => 'cd', {
     proxy => 'year'
 });
@@ -53,30 +88,57 @@ __PACKAGE__->might_have( lyrics => 'DBICTest::Schema::Lyrics', 'track_id' );
 __PACKAGE__->belongs_to(
     "year1999cd",
     "DBICTest::Schema::Year1999CDs",
-    { "foreign.cdid" => "self.cd" },
+    'cd',
     { join_type => 'left' },  # the relationship is of course optional
 );
 __PACKAGE__->belongs_to(
     "year2000cd",
     "DBICTest::Schema::Year2000CDs",
-    { "foreign.cdid" => "self.cd" },
+    'cd',
     { join_type => 'left' },
 );
 
-__PACKAGE__->might_have (
-    'next_track',
-    __PACKAGE__,
-    sub {
-        my ( $me_alias, $rel_alias, $me_result_source, $rel_name, $optional_me_object ) = @_;
-        return
-          ({ "${rel_alias}.cd"       => { '=', \"${me_alias}.cd" },
-             "${rel_alias}.position" => { '>', \"${me_alias}.position" },
-           },
-           $optional_me_object &&
-           { "${rel_alias}.cd"       => $optional_me_object->cd,
-             "${rel_alias}.position" => { '>', $optional_me_object->position },
-           });
-    },
+__PACKAGE__->has_many (
+  next_tracks => __PACKAGE__,
+  sub {
+    # This is for test purposes only. A regular user does not
+    # need to sanity check the passed-in arguments, this is what
+    # the tests are for :)
+    my $args = &check_customcond_args;
+
+    return (
+      { "$args->{foreign_alias}.cd"       => { -ident => "$args->{self_alias}.cd" },
+        "$args->{foreign_alias}.position" => { '>' => { -ident => "$args->{self_alias}.position" } },
+      },
+      $args->{self_result_object} && {
+        "$args->{foreign_alias}.cd"       => $args->{self_result_object}->get_column('cd'),
+        "$args->{foreign_alias}.position" => { '>' => $args->{self_result_object}->pos },
+      }
+    )
+  }
 );
 
+__PACKAGE__->has_many (
+  deliberately_broken_all_cd_tracks => __PACKAGE__,
+  sub {
+    # This is for test purposes only. A regular user does not
+    # need to sanity check the passed-in arguments, this is what
+    # the tests are for :)
+    my $args = &check_customcond_args;
+
+    return {
+      "$args->{foreign_alias}.cd" => "$args->{self_alias}.cd"
+    };
+  }
+);
+
+our $hook_cb;
+
+sub sqlt_deploy_hook {
+  my $class = shift;
+
+  $hook_cb->($class, @_) if $hook_cb;
+  $class->next::method(@_) if $class->next::can;
+}
+
 1;