X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F86sqlt.t;h=89783d361cb2494ea7b18b848baa002cdd3f8f7d;hb=fcf32d045;hp=531a8a32c88402b81fe1eb34498ca294500e64fd;hpb=553d61c42d75a595174a47d22c652ffe000efcd6;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/86sqlt.t b/t/86sqlt.t
index 531a8a3..89783d3 100644
--- a/t/86sqlt.t
+++ b/t/86sqlt.t
@@ -5,14 +5,118 @@ use Test::More;
 use lib qw(t/lib);
 use DBICTest;
 
-eval "use SQL::Translator";
-plan skip_all => 'SQL::Translator required' if $@;
+use Scalar::Util 'blessed';
 
-my $schema = DBICTest->init_schema;
+BEGIN {
+  require DBIx::Class;
+  plan skip_all =>
+      'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for ('deploy')
+    unless DBIx::Class::Optional::Dependencies->req_ok_for ('deploy')
+}
+
+my $custom_deployment_statements_called = 0;
+
+sub DBICTest::Schema::deployment_statements {
+  $custom_deployment_statements_called = 1;
+  my $self = shift;
+  return $self->next::method(@_);
+}
+
+
+# Check deployment statements ctx sensitivity
+{
+  my $schema = DBICTest->init_schema (no_deploy => 1);
+  my $not_first_table_creation_re = qr/CREATE TABLE fourkeys_to_twokeys/;
+
+  my $statements = $schema->deployment_statements;
+  like (
+    $statements,
+    $not_first_table_creation_re,
+    'All create statements returned in 1 string in scalar ctx'
+  );
+
+  my @statements = $schema->deployment_statements;
+  cmp_ok (scalar @statements, '>', 1, 'Multiple statement lines in array ctx');
+
+  my $i = 0;
+  while ($i <= $#statements) {
+    last if $statements[$i] =~ $not_first_table_creation_re;
+    $i++;
+  }
+
+  ok (
+    ($i > 0) && ($i <= $#statements),
+    "Creation statement was found somewherere within array ($i)"
+  );
+}
+
+{
+  # use our own throw-away schema, since we'll be deploying twice
+  my $schema = DBICTest->init_schema (no_deploy => 1);
 
-plan tests => 132;
+  my $deploy_hook_called = 0;
+  $custom_deployment_statements_called = 0;
+
+  # add a temporary sqlt_deploy_hook to a source
+  local $DBICTest::Schema::Track::hook_cb = sub {
+    my ($class, $sqlt_table) = @_;
+
+    $deploy_hook_called = 1;
+
+    is ($class, 'DBICTest::Track', 'Result class passed to plain hook');
+
+    is (
+      $sqlt_table->schema->translator->producer_type,
+      join ('::', 'SQL::Translator::Producer', $schema->storage->sqlt_type),
+      'Production type passed to translator object',
+    );
+  };
+
+  my $component_deploy_hook_called = 0;
+  local $DBICTest::DeployComponent::hook_cb = sub {
+    $component_deploy_hook_called = 1;
+  };
+
+  $schema->deploy; # do not remove, this fires the is() test in the callback above
+  ok($deploy_hook_called, 'deploy hook got called');
+  ok($custom_deployment_statements_called, '->deploy used the schemas deploy_statements method');
+  ok($component_deploy_hook_called, 'component deploy hook got called');
+}
+
+my $schema = DBICTest->init_schema (no_deploy => 1);
+
+{
+  my $deploy_hook_called = 0;
+  $custom_deployment_statements_called = 0;
+  my $sqlt_type = $schema->storage->sqlt_type;
 
-my $translator = SQL::Translator->new( 
+  # replace the sqlt calback with a custom version ading an index
+  $schema->source('Track')->sqlt_deploy_callback(sub {
+    my ($self, $sqlt_table) = @_;
+
+    $deploy_hook_called = 1;
+
+    is (
+      $sqlt_table->schema->translator->producer_type,
+      join ('::', 'SQL::Translator::Producer', $sqlt_type),
+      'Production type passed to translator object',
+    );
+
+    if ($sqlt_type eq 'SQLite' ) {
+      $sqlt_table->add_index( name => 'track_title', fields => ['title'] )
+        or die $sqlt_table->error;
+    }
+
+    $self->default_sqlt_deploy_hook($sqlt_table);
+  });
+
+  $schema->deploy; # do not remove, this fires the is() test in the callback above
+  ok($deploy_hook_called, 'deploy hook got called');
+  ok($custom_deployment_statements_called, '->deploy used the schemas deploy_statements method');
+}
+
+
+my $translator = SQL::Translator->new(
   parser_args => {
     'DBIx::Schema' => $schema,
   },
@@ -26,16 +130,6 @@ my $translator = SQL::Translator->new(
     my $relinfo = $schema->source('Artist')->relationship_info ('cds');
     local $relinfo->{attrs}{on_delete} = 'restrict';
 
-    $schema->source('Track')->sqlt_deploy_callback(sub {
-      my ($self, $sqlt_table) = @_;
-
-      if ($sqlt_table->schema->translator->producer_type =~ /SQLite$/ ) {
-        $sqlt_table->add_index( name => 'track_title', fields => ['title'] )
-          or die $sqlt_table->error;
-      }
-
-      $self->default_sqlt_deploy_hook($sqlt_table);
-    });
 
     $translator->parser('SQL::Translator::Parser::DBIx::Class');
     $translator->producer('SQLite');
@@ -45,7 +139,12 @@ my $translator = SQL::Translator->new(
     ok($output, "SQLT produced someoutput")
       or diag($translator->error);
 
-    like ($warn, qr/^SQLT attribute .+? was supplied for relationship/, 'Warn about dubious on_delete/on_update attributes');
+
+    like (
+      $warn,
+      qr/SQLT attribute .+? was supplied for relationship .+? which does not appear to be a foreign constraint/,
+      'Warn about dubious on_delete/on_update attributes',
+    );
 }
 
 # Note that the constraints listed here are the only ones that are tested -- if
@@ -61,15 +160,15 @@ my %fk_constraints = (
     {
       'display' => 'twokeys->cd',
       'name' => 'twokeys_fk_cd', 'index_name' => 'twokeys_idx_cd',
-      'selftable' => 'twokeys', 'foreigntable' => 'cd', 
-      'selfcols'  => ['cd'], 'foreigncols' => ['cdid'], 
+      'selftable' => 'twokeys', 'foreigntable' => 'cd',
+      'selfcols'  => ['cd'], 'foreigncols' => ['cdid'],
       'noindex'  => 1,
       on_delete => '', on_update => '', deferrable => 0,
     },
     {
       'display' => 'twokeys->artist',
       'name' => 'twokeys_fk_artist', 'index_name' => 'twokeys_idx_artist',
-      'selftable' => 'twokeys', 'foreigntable' => 'artist', 
+      'selftable' => 'twokeys', 'foreigntable' => 'artist',
       'selfcols'  => ['artist'], 'foreigncols' => ['artistid'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
@@ -80,16 +179,16 @@ my %fk_constraints = (
     {
       'display' => 'fourkeys_to_twokeys->twokeys',
       'name' => 'fourkeys_to_twokeys_fk_t_artist_t_cd', 'index_name' => 'fourkeys_to_twokeys_idx_t_artist_t_cd',
-      'selftable' => 'fourkeys_to_twokeys', 'foreigntable' => 'twokeys', 
-      'selfcols'  => ['t_artist', 't_cd'], 'foreigncols' => ['artist', 'cd'], 
+      'selftable' => 'fourkeys_to_twokeys', 'foreigntable' => 'twokeys',
+      'selfcols'  => ['t_artist', 't_cd'], 'foreigncols' => ['artist', 'cd'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
     {
       'display' => 'fourkeys_to_twokeys->fourkeys', 'index_name' => 'fourkeys_to_twokeys_idx_f_foo_f_bar_f_hello_f_goodbye',
       'name' => 'fourkeys_to_twokeys_fk_f_foo_f_bar_f_hello_f_goodbye',
-      'selftable' => 'fourkeys_to_twokeys', 'foreigntable' => 'fourkeys', 
+      'selftable' => 'fourkeys_to_twokeys', 'foreigntable' => 'fourkeys',
       'selfcols'  => [qw(f_foo f_bar f_hello f_goodbye)],
-      'foreigncols' => [qw(foo bar hello goodbye)], 
+      'foreigncols' => [qw(foo bar hello goodbye)],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
   ],
@@ -99,14 +198,14 @@ my %fk_constraints = (
     {
       'display' => 'cd_to_producer->cd',
       'name' => 'cd_to_producer_fk_cd', 'index_name' => 'cd_to_producer_idx_cd',
-      'selftable' => 'cd_to_producer', 'foreigntable' => 'cd', 
+      'selftable' => 'cd_to_producer', 'foreigntable' => 'cd',
       'selfcols'  => ['cd'], 'foreigncols' => ['cdid'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
     {
       'display' => 'cd_to_producer->producer',
       'name' => 'cd_to_producer_fk_producer', 'index_name' => 'cd_to_producer_idx_producer',
-      'selftable' => 'cd_to_producer', 'foreigntable' => 'producer', 
+      'selftable' => 'cd_to_producer', 'foreigntable' => 'producer',
       'selfcols'  => ['producer'], 'foreigncols' => ['producerid'],
       on_delete => '', on_update => '', deferrable => 1,
     },
@@ -117,14 +216,14 @@ my %fk_constraints = (
     {
       'display' => 'self_ref_alias->self_ref for self_ref',
       'name' => 'self_ref_alias_fk_self_ref', 'index_name' => 'self_ref_alias_idx_self_ref',
-      'selftable' => 'self_ref_alias', 'foreigntable' => 'self_ref', 
+      'selftable' => 'self_ref_alias', 'foreigntable' => 'self_ref',
       'selfcols'  => ['self_ref'], 'foreigncols' => ['id'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
     {
       'display' => 'self_ref_alias->self_ref for alias',
       'name' => 'self_ref_alias_fk_alias', 'index_name' => 'self_ref_alias_idx_alias',
-      'selftable' => 'self_ref_alias', 'foreigntable' => 'self_ref', 
+      'selftable' => 'self_ref_alias', 'foreigntable' => 'self_ref',
       'selfcols'  => ['alias'], 'foreigncols' => ['id'],
       on_delete => '', on_update => '', deferrable => 1,
     },
@@ -135,7 +234,7 @@ my %fk_constraints = (
     {
       'display' => 'cd->artist',
       'name' => 'cd_fk_artist', 'index_name' => 'cd_idx_artist',
-      'selftable' => 'cd', 'foreigntable' => 'artist', 
+      'selftable' => 'cd', 'foreigntable' => 'artist',
       'selfcols'  => ['artist'], 'foreigncols' => ['artistid'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
@@ -146,16 +245,16 @@ my %fk_constraints = (
     {
       'display' => 'artist_undirected_map->artist for id1',
       'name' => 'artist_undirected_map_fk_id1', 'index_name' => 'artist_undirected_map_idx_id1',
-      'selftable' => 'artist_undirected_map', 'foreigntable' => 'artist', 
+      'selftable' => 'artist_undirected_map', 'foreigntable' => 'artist',
       'selfcols'  => ['id1'], 'foreigncols' => ['artistid'],
       on_delete => 'RESTRICT', on_update => 'CASCADE', deferrable => 1,
     },
     {
       'display' => 'artist_undirected_map->artist for id2',
       'name' => 'artist_undirected_map_fk_id2', 'index_name' => 'artist_undirected_map_idx_id2',
-      'selftable' => 'artist_undirected_map', 'foreigntable' => 'artist', 
+      'selftable' => 'artist_undirected_map', 'foreigntable' => 'artist',
       'selfcols'  => ['id2'], 'foreigncols' => ['artistid'],
-      on_delete => '', on_update => 'CASCADE', deferrable => 1,
+      on_delete => '', on_update => '', deferrable => 1,
     },
   ],
 
@@ -164,7 +263,7 @@ my %fk_constraints = (
     {
       'display' => 'track->cd',
       'name' => 'track_fk_cd', 'index_name' => 'track_idx_cd',
-      'selftable' => 'track', 'foreigntable' => 'cd', 
+      'selftable' => 'track', 'foreigntable' => 'cd',
       'selfcols'  => ['cd'], 'foreigncols' => ['cdid'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
@@ -175,7 +274,7 @@ my %fk_constraints = (
     {
       'display' => 'treelike->treelike for parent',
       'name' => 'treelike_fk_parent', 'index_name' => 'treelike_idx_parent',
-      'selftable' => 'treelike', 'foreigntable' => 'treelike', 
+      'selftable' => 'treelike', 'foreigntable' => 'treelike',
       'selfcols'  => ['parent'], 'foreigncols' => ['id'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
@@ -186,7 +285,7 @@ my %fk_constraints = (
     {
       'display' => 'twokeytreelike->twokeytreelike for parent1,parent2',
       'name' => 'twokeytreelike_fk_parent1_parent2', 'index_name' => 'twokeytreelike_idx_parent1_parent2',
-      'selftable' => 'twokeytreelike', 'foreigntable' => 'twokeytreelike', 
+      'selftable' => 'twokeytreelike', 'foreigntable' => 'twokeytreelike',
       'selfcols'  => ['parent1', 'parent2'], 'foreigncols' => ['id1','id2'],
       on_delete => '', on_update => '', deferrable => 1,
     },
@@ -197,7 +296,7 @@ my %fk_constraints = (
     {
       'display' => 'tags->cd',
       'name' => 'tags_fk_cd', 'index_name' => 'tags_idx_cd',
-      'selftable' => 'tags', 'foreigntable' => 'cd', 
+      'selftable' => 'tags', 'foreigntable' => 'cd',
       'selfcols'  => ['cd'], 'foreigncols' => ['cdid'],
       on_delete => 'CASCADE', on_update => 'CASCADE', deferrable => 1,
     },
@@ -208,9 +307,9 @@ my %fk_constraints = (
     {
       'display' => 'bookmark->link',
       'name' => 'bookmark_fk_link', 'index_name' => 'bookmark_idx_link',
-      'selftable' => 'bookmark', 'foreigntable' => 'link', 
+      'selftable' => 'bookmark', 'foreigntable' => 'link',
       'selfcols'  => ['link'], 'foreigncols' => ['id'],
-      on_delete => '', on_update => '', deferrable => 1,
+      on_delete => 'SET NULL', on_update => 'CASCADE', deferrable => 1,
     },
   ],
   # ForceForeign
@@ -218,8 +317,9 @@ my %fk_constraints = (
     {
       'display' => 'forceforeign->artist',
       'name' => 'forceforeign_fk_artist', 'index_name' => 'forceforeign_idx_artist',
-      'selftable' => 'forceforeign', 'foreigntable' => 'artist', 
-      'selfcols'  => ['artist'], 'foreigncols' => ['artistid'], 
+      'selftable' => 'forceforeign', 'foreigntable' => 'artist',
+      'selfcols'  => ['artist'], 'foreigncols' => ['artistid'],
+      'noindex'  => 1,
       on_delete => '', on_update => '', deferrable => 1,
     },
   ],
@@ -288,7 +388,7 @@ SKIP: {
     skip ('Artist sqlt_deploy_hook is only called with an SQLite backend', 1)
         if $schema->storage->sqlt_type ne 'SQLite';
 
-    ok( ( grep 
+    ok( ( grep
         { $_->name eq 'artist_name_hookidx' }
         $tschema->get_table('artist')->get_indices
     ), 'sqlt_deploy_hook fired within a resultsource');
@@ -389,7 +489,7 @@ sub get_index {
 
  CAND_INDEX:
   for my $cand_index ( $table->get_indices ) {
-   
+
     next CAND_INDEX if $index->{name} && $cand_index->name ne $index->{name}
                     || $index->{type} && $cand_index->type ne $index->{type};
 
@@ -415,21 +515,21 @@ sub test_fk {
   my ($expected, $got) = @_;
   my $desc = $expected->{display};
   is( $got->name, $expected->{name},
-      "name parameter correct for `$desc'" );
+      "name parameter correct for '$desc'" );
   is( $got->on_delete, $expected->{on_delete},
-      "on_delete parameter correct for `$desc'" );
+      "on_delete parameter correct for '$desc'" );
   is( $got->on_update, $expected->{on_update},
-      "on_update parameter correct for `$desc'" );
+      "on_update parameter correct for '$desc'" );
   is( $got->deferrable, $expected->{deferrable},
-      "is_deferrable parameter correct for `$desc'" );
+      "is_deferrable parameter correct for '$desc'" );
 
   my $index = get_index( $got->table, { fields => $expected->{selfcols} } );
 
   if ($expected->{noindex}) {
-      ok( !defined $index, "index doesn't for `$desc'" );
+      ok( !defined $index, "index doesn't for '$desc'" );
   } else {
-      ok( defined $index, "index exists for `$desc'" );
-      is( $index->name, $expected->{index_name}, "index has correct name for `$desc'" );
+      ok( defined $index, "index exists for '$desc'" );
+      is( $index->name, $expected->{index_name}, "index has correct name for '$desc'" );
   }
 }
 
@@ -437,5 +537,7 @@ sub test_unique {
   my ($expected, $got) = @_;
   my $desc = $expected->{display};
   is( $got->name, $expected->{name},
-      "name parameter correct for `$desc'" );
+      "name parameter correct for '$desc'" );
 }
+
+done_testing;