X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F99dbic_sqlt_parser.t;h=b8b57cf25a1c45d34b81612edf137767cc9d83b3;hb=wip%2Finsert_select_take2;hp=7487c725365cc314f98ae85791ec3d72f96f1d3f;hpb=2527233b404455c2114f90da8041f42cd957f541;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/99dbic_sqlt_parser.t b/t/99dbic_sqlt_parser.t
index 7487c72..b8b57cf 100644
--- a/t/99dbic_sqlt_parser.t
+++ b/t/99dbic_sqlt_parser.t
@@ -2,11 +2,13 @@ use strict;
 use warnings;
 
 use Test::More;
+use Test::Warn;
 use Test::Exception;
+use Scalar::Util ();
+
 use lib qw(t/lib);
 use DBICTest;
-use DBICTest::Schema;
-use Scalar::Util ();
+use DBIx::Class::_Util 'sigwarn_silencer';
 
 BEGIN {
   require DBIx::Class;
@@ -18,14 +20,80 @@ BEGIN {
 # Test for SQLT-related leaks
 {
   my $s = DBICTest::Schema->clone;
-  create_schema ({ schema => $s });
+
+  my @schemas = (
+    create_schema ({ schema => $s }),
+    create_schema ({ args => { parser_args => { dbic_schema => $s } } }),
+  );
+
+  for my $parser_args_key (qw(
+    DBIx::Class::Schema
+    DBIx::Schema
+    package
+  )) {
+    warnings_exist {
+      push @schemas, create_schema({
+        args => { parser_args => { $parser_args_key => $s } }
+      });
+    } qr/\Qparser_args => {\E.+?is deprecated.+\Q@{[__FILE__]}/,
+    "deprecated crazy parser_arg '$parser_args_key' warned";
+  }
+
   Scalar::Util::weaken ($s);
 
   ok (!$s, 'Schema not leaked');
+
+  isa_ok ($_, 'SQL::Translator::Schema', "SQLT schema object $_ produced")
+    for @schemas;
+}
+
+# make sure classname-style works
+lives_ok { isa_ok (create_schema ({ schema => 'DBICTest::Schema' }), 'SQL::Translator::Schema', 'SQLT schema object produced') };
+
+# make sure a connected instance passed via $args does not get the $dbh improperly serialized
+SKIP: {
+
+  # YAML is a build_requires dep of SQLT - it may or may not be here
+  eval { require YAML } or skip "Test requires YAML.pm", 1;
+
+  lives_ok {
+
+    my $s = DBICTest->init_schema(no_populate => 1);
+    ok ($s->storage->connected, '$schema instance connected');
+
+    # roundtrip through YAML
+    my $yaml_rt_schema = SQL::Translator->new(
+      parser => 'SQL::Translator::Parser::YAML'
+    )->translate(
+      data => SQL::Translator->new(
+        parser_args => { dbic_schema => $s },
+        parser => 'SQL::Translator::Parser::DBIx::Class',
+        producer => 'SQL::Translator::Producer::YAML',
+      )->translate
+    );
+
+    isa_ok ( $yaml_rt_schema, 'SQL::Translator::Schema', 'SQLT schema object produced after YAML roundtrip');
+
+    ok ($s->storage->connected, '$schema instance still connected');
+  }
+
+  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"
+        if $_[0] =~ /is not a DBI/;
+      warn @_;
+    };
+  }
+EOE
+
 }
 
+my $schema = DBICTest->init_schema( no_deploy => 1 );
 
-my $schema = DBICTest->init_schema();
 # Dummy was yanked out by the sqlt hook test
 # CustomSql tests the horrific/deprecated ->name(\$sql) hack
 # YearXXXXCDs are views
@@ -129,16 +197,77 @@ lives_ok (sub {
 
 });
 
+{
+  package DBICTest::PartialSchema;
+
+  use base qw/DBIx::Class::Schema/;
+
+  __PACKAGE__->load_classes(
+    { 'DBICTest::Schema' => [qw/
+      CD
+      Track
+      Tag
+      Producer
+      CD_to_Producer
+    /]}
+  );
+}
+
+{
+  my $partial_schema = DBICTest::PartialSchema->connect(DBICTest->_database);
+
+  lives_ok (sub {
+    my $sqlt_schema = do {
+
+      local $SIG{__WARN__} = sigwarn_silencer(
+        qr/Ignoring relationship .+ related resultsource .+ is not registered with this schema/
+      );
+
+      create_schema({ schema => $partial_schema });
+    };
+
+    my @tables = $sqlt_schema->get_tables;
+
+    is_deeply (
+      [sort map { $_->name } @tables],
+      [qw/cd cd_to_producer producer tags track/],
+      'partial dbic schema parsing ok',
+    );
+
+    # the primary key is currently unnamed in sqlt - adding below
+    my %constraints_for_table = (
+      producer =>       [qw/prod_name                                                         /],
+      tags =>           [qw/tagid_cd tagid_cd_tag tags_fk_cd tags_tagid_tag tags_tagid_tag_cd /],
+      track =>          [qw/track_cd_position track_cd_title track_fk_cd                      /],
+      cd =>             [qw/cd_artist_title cd_fk_single_track                                /],
+      cd_to_producer => [qw/cd_to_producer_fk_cd cd_to_producer_fk_producer                   /],
+    );
+
+    for my $table (@tables) {
+      my $tablename = $table->name;
+      my @constraints = $table->get_constraints;
+      is_deeply (
+        [ sort map { $_->name } @constraints ],
+
+        # the primary key (present on all loaded tables) is currently named '' in sqlt
+        # subject to future changes
+        [ '', @{$constraints_for_table{$tablename}} ],
+
+        "constraints of table '$tablename' ok",
+      );
+    }
+  }, 'partial schema tests successful');
+}
+
 done_testing;
 
 sub create_schema {
   my $args = shift;
 
-  my $schema = $args->{schema};
   my $additional_sqltargs = $args->{args} || {};
 
   my $sqltargs = {
-    add_drop_table => 1, 
+    add_drop_table => 1,
     ignore_constraint_names => 1,
     ignore_index_names => 1,
     %{$additional_sqltargs}
@@ -147,7 +276,9 @@ sub create_schema {
   my $sqlt = SQL::Translator->new( $sqltargs );
 
   $sqlt->parser('SQL::Translator::Parser::DBIx::Class');
-  return $sqlt->translate({ data => $schema }) || die $sqlt->error;
+  return $sqlt->translate(
+    $args->{schema} ? ( data => $args->{schema} ) : ()
+  ) || die $sqlt->error;
 }
 
 sub get_table {