X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F86sqlt.t;h=a6b17ecf317c9a44bfe99bfa56cde449a4cf7b2d;hb=wip%2Fcount-no-soft-limit;hp=6435ba9e3dec8cde91779c62d929498b41d6f7e6;hpb=7f3fd2621c5509873aa30e7a68b7dd670421cc86;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/86sqlt.t b/t/86sqlt.t
index 6435ba9..a6b17ec 100644
--- a/t/86sqlt.t
+++ b/t/86sqlt.t
@@ -1,18 +1,14 @@
+use DBIx::Class::Optional::Dependencies -skip_all_without => 'deploy';
+
 use strict;
 use warnings;
 
 use Test::More;
-use lib qw(t/lib);
-use DBICTest;
-
+use Test::Warn;
 use Scalar::Util 'blessed';
 
-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')
-}
+use lib qw(t/lib);
+use DBICTest;
 
 my $custom_deployment_statements_called = 0;
 
@@ -22,12 +18,10 @@ sub DBICTest::Schema::deployment_statements {
   return $self->next::method(@_);
 }
 
-my $schema = DBICTest->init_schema (no_deploy => 1);
-
-
 # Check deployment statements ctx sensitivity
 {
-  my $not_first_table_creation_re = qr/CREATE TABLE fourkeys_to_twokeys/;
+  my $schema = DBICTest->init_schema (no_deploy => 1, quote_names => 1);
+  my $not_first_table_creation_re = qr/CREATE TABLE "fourkeys_to_twokeys"/;
 
   my $statements = $schema->deployment_statements;
   like (
@@ -59,8 +53,7 @@ my $schema = DBICTest->init_schema (no_deploy => 1);
   $custom_deployment_statements_called = 0;
 
   # add a temporary sqlt_deploy_hook to a source
-  no warnings 'once';
-  local *DBICTest::Track::sqlt_deploy_hook = sub {
+  local $DBICTest::Schema::Track::hook_cb = sub {
     my ($class, $sqlt_table) = @_;
 
     $deploy_hook_called = 1;
@@ -74,14 +67,23 @@ my $schema = DBICTest->init_schema (no_deploy => 1);
     );
   };
 
+  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;
 
   # replace the sqlt calback with a custom version ading an index
   $schema->source('Track')->sqlt_deploy_callback(sub {
@@ -91,11 +93,11 @@ my $schema = DBICTest->init_schema (no_deploy => 1);
 
     is (
       $sqlt_table->schema->translator->producer_type,
-      join ('::', 'SQL::Translator::Producer', $schema->storage->sqlt_type),
+      join ('::', 'SQL::Translator::Producer', $sqlt_type),
       'Production type passed to translator object',
     );
 
-    if ($schema->storage->sqlt_type eq 'SQLite' ) {
+    if ($sqlt_type eq 'SQLite' ) {
       $sqlt_table->add_index( name => 'track_title', fields => ['title'] )
         or die $sqlt_table->error;
     }
@@ -109,21 +111,17 @@ my $schema = DBICTest->init_schema (no_deploy => 1);
 }
 
 
-my $translator = SQL::Translator->new( 
+my $translator = SQL::Translator->new(
   parser_args => {
-    'DBIx::Schema' => $schema,
+    dbic_schema => $schema,
   },
   producer_args => {},
 );
 
-{
-    my $warn = '';
-    local $SIG{__WARN__} = sub { $warn = shift };
-
+warnings_exist {
     my $relinfo = $schema->source('Artist')->relationship_info ('cds');
     local $relinfo->{attrs}{on_delete} = 'restrict';
 
-
     $translator->parser('SQL::Translator::Parser::DBIx::Class');
     $translator->producer('SQLite');
 
@@ -132,13 +130,9 @@ my $translator = SQL::Translator->new(
     ok($output, "SQLT produced someoutput")
       or diag($translator->error);
 
-
-    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',
-    );
-}
+} [
+  (qr/SQLT attribute .+? was supplied for relationship .+? which does not appear to be a foreign constraint/) x 2
+], 'Warn about dubious on_delete/on_update attributes';
 
 # Note that the constraints listed here are the only ones that are tested -- if
 # more exist in the Schema than are listed here and all listed constraints are
@@ -153,15 +147,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,
     },
@@ -172,16 +166,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,
     },
   ],
@@ -191,14 +185,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,
     },
@@ -209,14 +203,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,
     },
@@ -227,7 +221,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,
     },
@@ -238,14 +232,14 @@ 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 => '', deferrable => 1,
     },
@@ -256,7 +250,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,
     },
@@ -267,7 +261,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,
     },
@@ -278,7 +272,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,
     },
@@ -289,7 +283,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,
     },
@@ -300,7 +294,7 @@ 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 => 'SET NULL', on_update => 'CASCADE', deferrable => 1,
     },
@@ -310,8 +304,8 @@ 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,
     },
@@ -381,7 +375,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');
@@ -482,7 +476,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};