preserve relnames when another FK is added (RT#62424), remove resultset_components...

[dbsrgits/DBIx-Class-Schema-Loader.git] / lib / DBIx / Class / Schema / Loader / Utils.pm

diff --git a/lib/DBIx/Class/Schema/Loader/Utils.pm b/lib/DBIx/Class/Schema/Loader/Utils.pm
index a1350c7..f67988f 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader/Utils.pm
+++ b/lib/DBIx/Class/Schema/Loader/Utils.pm
@@ -4,9 +4,11 @@ package # hide from PAUSE
 use strict;
 use warnings;
 use Data::Dumper ();
+use Test::More;
+use namespace::clean;
 use Exporter 'import';
 
-our @EXPORT_OK = qw/split_name dumper dumper_squashed eval_without_redefine_warnings/;
+our @EXPORT_OK = qw/split_name dumper dumper_squashed eval_without_redefine_warnings warnings_exist warnings_exist_silent/;
 
 use constant BY_CASE_TRANSITION =>
     qr/(?<=[[:lower:]\d])[\W_]*(?=[[:upper:]])|[\W_]+/;
@@ -48,5 +50,38 @@ sub eval_without_redefine_warnings {
     die $@ if $@;
 }
 
+sub warnings_exist(&$$) {
+    my ($code, $re, $test_name) = @_;
+
+    my $matched = 0;
+
+    my $warn_handler = $SIG{__WARN__} || sub { warn @_ };
+    local $SIG{__WARN__} = sub {
+        if ($_[0] =~ $re) {
+            $matched = 1;
+        }
+        else {
+            $warn_handler->(@_)
+        }
+    };
+
+    $code->();
+
+    ok $matched, $test_name;
+}
+
+sub warnings_exist_silent(&$$) {
+    my ($code, $re, $test_name) = @_;
+
+    my $matched = 0;
+
+    local $SIG{__WARN__} = sub { $matched = 1 if $_[0] =~ $re; };
+
+    $code->();
+
+    ok $matched, $test_name;
+}
+
+
 1;
 # vim:et sts=4 sw=4 tw=0: