X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F99dbic_sqlt_parser.t;h=e076e147b36691633cfbe79eecf6b65ccdc8be3b;hb=1d29e7e26524c98be9ce63a91ec91b1e0d75c03d;hp=33c33c260df0e571954f1b3fbd344f485cf32037;hpb=569b96bba24cd24097c3496d6c6da02498933190;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t
index 33c33c2..e076e14 100644
--- a/t/99dbic_sqlt_parser.t
+++ b/t/99dbic_sqlt_parser.t
@@ -8,6 +8,7 @@ use Scalar::Util ();
 
 use lib qw(t/lib);
 use DBICTest;
+use DBIx::Class::_Util 'sigwarn_silencer';
 
 BEGIN {
   require DBIx::Class;
@@ -18,6 +19,7 @@ BEGIN {
 
 # Test for SQLT-related leaks
 {
+  require DBICTest::Schema;
   my $s = DBICTest::Schema->clone;
 
   my @schemas = (
@@ -78,6 +80,8 @@ SKIP: {
 
   eval <<'EOE' or die $@;
   END {
+    # we are in END - everything remains global
+    #
     $^W = 1;  # important, otherwise DBI won't trip the next fail()
     $SIG{__WARN__} = sub {
       fail "Unexpected global destruction warning"
@@ -216,10 +220,9 @@ lives_ok (sub {
   lives_ok (sub {
     my $sqlt_schema = do {
 
-      local $SIG{__WARN__} = sub {
-        warn @_
-          unless $_[0] =~ /Ignoring relationship .+ related resultsource .+ is not registered with this schema/
-      };
+      local $SIG{__WARN__} = sigwarn_silencer(
+        qr/Ignoring relationship .+ related resultsource .+ is not registered with this schema/
+      );
 
       create_schema({ schema => $partial_schema });
     };
@@ -257,6 +260,28 @@ lives_ok (sub {
   }, 'partial schema tests successful');
 }
 
+{
+  my $cd_rsrc = $schema->source('CD');
+  $cd_rsrc->name(\'main.cd');
+
+  my $sqlt_schema = create_schema(
+    { schema => $schema },
+    args => { ignore_constraint_names => 0, ignore_index_names => 0 }
+  );
+
+  foreach my $source_name (qw(CD)) {
+    my $table = get_table($sqlt_schema, $schema, $source_name);
+    ok(
+      !(grep {$_->name =~ m/main\./} $table->get_indices),
+      'indices have periods stripped out'
+    );
+    ok(
+      !(grep {$_->name =~ m/main\./} $table->get_constraints),
+      'constraints have periods stripped out'
+    );
+  }
+}
+
 done_testing;
 
 sub create_schema {