X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F99dbic_sqlt_parser.t;h=0b368508b1cfcf3ef0d4564df414671ea3e500b2;hb=c1f3f2e8a79c6a4081c9949fa30da09d18d64d3b;hp=82d9364264b10ad77efb0752db140460895e9d74;hpb=31399b48455c44ca45cc1e143ae58ef0a55ce2ff;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t
index 82d9364..0b36850 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;
@@ -34,7 +35,7 @@ BEGIN {
       push @schemas, create_schema({
         args => { parser_args => { $parser_args_key => $s } }
       });
-    } qr/\Qparser_args => {\E.+?is deprecated/,
+    } qr/\Qparser_args => {\E.+?is deprecated.+\Q@{[__FILE__]}/,
     "deprecated crazy parser_arg '$parser_args_key' warned";
   }
 
@@ -65,7 +66,7 @@ SKIP: {
       parser => 'SQL::Translator::Parser::YAML'
     )->translate(
       data => SQL::Translator->new(
-        parser_args => { package => $s },
+        parser_args => { dbic_schema => $s },
         parser => 'SQL::Translator::Parser::DBIx::Class',
         producer => 'SQL::Translator::Producer::YAML',
       )->translate
@@ -78,6 +79,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 +219,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 +259,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 {