Merge branch 'master' into view-deps
Peter Rabbitson [Sat, 12 Jun 2010 21:11:57 +0000 (23:11 +0200)]
29 files changed:
lib/DBIx/Class.pm
lib/DBIx/Class/ResultSource/View.pm
lib/SQL/Translator/Parser/DBIx/Class.pm
t/105view_deps.t [new file with mode: 0644]
t/lib/ViewDeps.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/ANameArtists.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/AbNameArtists.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/AbaNameArtists.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/AbaNameArtistsAnd2010CDsWithManyTracks.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/Artist.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/Artwork.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/CD.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/Track.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/TrackNumberFives.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/Year2010CDs.pm [new file with mode: 0644]
t/lib/ViewDeps/Result/Year2010CDsWithManyTracks.pm [new file with mode: 0644]
t/lib/ViewDepsBad.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/ANameArtists.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/AbNameArtists.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/AbaNameArtists.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/AbaNameArtists.pm~ [new file with mode: 0644]
t/lib/ViewDepsBad/Result/AbaNameArtistsAnd2010CDsWithManyTracks.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/Artist.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/Artwork.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/CD.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/Track.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/TrackNumberFives.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/Year2010CDs.pm [new file with mode: 0644]
t/lib/ViewDepsBad/Result/Year2010CDsWithManyTracks.pm [new file with mode: 0644]

index c749bec..c7c05f4 100644 (file)
@@ -229,6 +229,8 @@ aherzog: Adam Herzog <adam@herzogdesigns.com>
 
 Alexander Keusch <cpan@keusch.at>
 
+amiri: Amiri Barksdale <amiri@metalabel.com>
+
 amoore: Andrew Moore <amoore@cpan.org>
 
 andyg: Andy Grundman <andy@hybridized.org>
index 3dde9bd..2771ca9 100644 (file)
@@ -8,8 +8,7 @@ use DBIx::Class::ResultSet;
 use base qw/DBIx::Class/;
 __PACKAGE__->load_components(qw/ResultSource/);
 __PACKAGE__->mk_group_accessors(
-  'simple' => qw(is_virtual view_definition)
-);
+    'simple' => qw(is_virtual view_definition deploy_depends_on) );
 
 =head1 NAME
 
@@ -130,6 +129,14 @@ database-based view.
 An SQL query for your view. Will not be translated across database
 syntaxes.
 
+=head2 deploy_depends_on 
+
+  __PACKAGE__->result_source_instance->deploy_depends_on(
+      "MyDB::Schema::Result::Year","MyDB::Schema::Result::CD"
+      );
+
+Specify the views (and only the views) that this view depends on.
+Pass this an array reference.
 
 =head1 OVERRIDDEN METHODS
 
@@ -141,24 +148,36 @@ or the SQL as a subselect if this is a virtual view.
 =cut
 
 sub from {
-  my $self = shift;
-  return \"(${\$self->view_definition})" if $self->is_virtual;
-  return $self->name;
+    my $self = shift;
+    return \"(${\$self->view_definition})" if $self->is_virtual;
+    return $self->name;
 }
 
-1;
+=head1 OTHER METHODS
 
-=head1 AUTHORS
+=head2 new
 
-Matt S. Trout <mst@shadowcatsystems.co.uk>
+The constructor.
 
-With Contributions from:
+=cut
 
-Guillermo Roditi E<lt>groditi@cpan.orgE<gt>
+sub new {
+    my ( $self, @args ) = @_;
+    my $new = $self->next::method(@args);
+    $new->{deploy_depends_on}
+        = {
+            map { $_->result_source_instance->name => 1 }
+            @{ $new->{deploy_depends_on}||[] }
+          }
+        unless ref $new->{deploy_depends_on} eq 'HASH';
+    return $new;
+}
 
-Jess Robinson <castaway@desert-island.me.uk>
+1;
+
+=head1 AUTHORS
 
-Wallace Reis <wreis@cpan.org>
+See L<DBIx::Class/CONTRIBUTORS>.
 
 =head1 LICENSE
 
index ad5998d..bd3d3ba 100644 (file)
@@ -270,6 +270,7 @@ sub parse {
     my $dependencies = {
       map { $_ => _resolve_deps ($_, \%tables) } (keys %tables)
     };
+
     for my $table (sort
       {
         keys %{$dependencies->{$a} || {} } <=> keys %{ $dependencies->{$b} || {} }
@@ -298,9 +299,25 @@ EOW
     }
 
     my %views;
-    foreach my $moniker (sort keys %view_monikers)
+    my @views = map { $dbicschema->source($_) } keys %view_monikers;
+
+    my $view_dependencies = {
+        map {
+            $_ => _resolve_view_deps( $dbicschema->source($_), \%view_monikers )
+          } ( keys %view_monikers )
+    };
+
+    my @view_sources =
+      sort {
+        keys %{ $view_dependencies->{ $a->source_name }   || {} } <=>
+          keys %{ $view_dependencies->{ $b->source_name } || {} }
+          || $a->source_name cmp $b->source_name
+      }
+      map { $dbicschema->source($_) }
+      keys %view_monikers;
+
+    foreach my $source (@view_sources)
     {
-        my $source = $dbicschema->source($moniker);
         my $view_name = $source->name;
 
         # FIXME - this isn't the right way to do it, but sqlt does not
@@ -368,6 +385,32 @@ sub _resolve_deps {
   return $ret;
 }
 
+sub _resolve_view_deps {
+    my ( $view, $monikers, $seen ) = @_;
+
+    my $ret = {};
+    $seen ||= {};
+
+    # copy and bump all deps by one (so we can reconstruct the chain)
+    my %seen = map { $_ => $seen->{$_} + 1 } ( keys %$seen );
+    $seen{ $view->source_name } = 1;
+    for my $dep ( keys %{ $view->{deploy_depends_on} } ) {
+        if ( $seen->{$dep} ) {
+            return {};
+        }
+        my ($new_source_name) =
+          grep { $view->schema->source($_)->name eq $dep }
+          @{ [ $view->schema->sources ] };
+        my $subdeps =
+          _resolve_view_deps( $view->schema->source($new_source_name),
+            $monikers, \%seen, );
+        $ret->{$_} += $subdeps->{$_} for ( keys %$subdeps );
+
+        ++$ret->{$dep};
+    }
+    return $ret;
+}
+
 1;
 
 =head1 NAME
diff --git a/t/105view_deps.t b/t/105view_deps.t
new file mode 100644 (file)
index 0000000..d53dc79
--- /dev/null
@@ -0,0 +1,109 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Exception;
+use lib qw(t/lib);
+use ViewDeps;
+use ViewDepsBad;
+
+BEGIN {
+    use_ok('DBIx::Class::ResultSource::View');
+}
+
+#################### SANITY
+
+my $view = DBIx::Class::ResultSource::View->new;
+
+isa_ok( $view, 'DBIx::Class::ResultSource', 'A new view' );
+isa_ok( $view, 'DBIx::Class', 'A new view also' );
+
+can_ok( $view, $_ ) for qw/new from deploy_depends_on/;
+
+#################### DEPS
+
+my $schema
+    = ViewDeps->connect( 'dbi:SQLite::memory:', { quote_char => '"', } );
+ok( $schema, 'Connected to ViewDeps schema OK' );
+
+#################### DEPLOY
+
+$schema->deploy( { add_drop_table => 1 } );
+
+#################### DOES ORDERING WORK?
+
+my $sqlt_object = $schema->{sqlt};
+
+my @keys = keys %{ $sqlt_object->{views} };
+
+my @sqlt_sources = sort {
+    $sqlt_object->{views}->{$a}->{order}
+        cmp $sqlt_object->{views}->{$b}->{order}
+} @keys;
+
+my @expected
+    = qw/a_name_artists track_number_fives year_2010_cds ab_name_artists year_2010_cds_with_many_tracks aba_name_artists aba_name_artists_and_2010_cds_with_many_tracks/;
+
+is_deeply( \@expected, \@sqlt_sources,
+    "SQLT view order triumphantly matches our order." );
+
+#################### AND WHAT ABOUT USING THE SCHEMA?
+
+lives_ok( sub { $schema->resultset($_)->next }, "Query on $_ succeeds" )
+    for grep {
+    $schema->resultset($_)
+        ->result_source->isa('DBIx::Class::ResultSource::View')
+    } @{ [ $schema->sources ] };
+
+#################### AND WHAT ABOUT A BAD DEPS CHAIN IN A VIEW?
+
+my $schema2
+    = ViewDepsBad->connect( 'dbi:SQLite::memory:', { quote_char => '"', } );
+ok( $schema2, 'Connected to ViewDepsBad schema OK' );
+
+#################### DEPLOY2
+
+$schema2->deploy( { add_drop_table => 1 } );
+
+#################### DOES ORDERING WORK 2?
+
+my $sqlt_object2 = $schema2->{sqlt};
+
+my @keys2 = keys %{ $sqlt_object->{views} };
+
+my @sqlt_sources2 = sort {
+    $sqlt_object->{views}->{$a}->{order}
+        cmp $sqlt_object->{views}->{$b}->{order}
+} @keys2;
+
+my @expected2
+    = qw/a_name_artists track_number_fives year_2010_cds ab_name_artists year_2010_cds_with_many_tracks aba_name_artists aba_name_artists_and_2010_cds_with_many_tracks/;
+
+is_deeply( \@expected2, \@sqlt_sources2,
+    "SQLT view order triumphantly matches our order." );
+
+#################### AND WHAT ABOUT USING THE SCHEMA2?
+
+lives_ok( sub { $schema2->resultset($_)->next }, "Query on $_ succeeds" )
+    for grep {
+    $schema2->resultset($_)
+        ->result_source->isa('DBIx::Class::ResultSource::View')
+    } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ }
+    @{ [ $schema2->sources ] };
+
+dies_ok(
+    sub {
+        $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next;
+    },
+    "Query on AbaNameArtistsAnd2010CDsWithManyTracks dies, because of incorrect deploy_depends_on in AbaNameArtists"
+);
+
+throws_ok {
+    $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next;
+}
+qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/,
+    "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist";
+
+done_testing;
diff --git a/t/lib/ViewDeps.pm b/t/lib/ViewDeps.pm
new file mode 100644 (file)
index 0000000..6c3a311
--- /dev/null
@@ -0,0 +1,16 @@
+package    # hide from PAUSE
+    ViewDeps;
+## Used in 105view_deps.t
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_namespaces;
+
+sub sqlt_deploy_hook {
+    my $self = shift;
+    $self->{sqlt} = shift;
+}
+
+1;
diff --git a/t/lib/ViewDeps/Result/ANameArtists.pm b/t/lib/ViewDeps/Result/ANameArtists.pm
new file mode 100644 (file)
index 0000000..e6fbb0f
--- /dev/null
@@ -0,0 +1,25 @@
+package    # hide from PAUSE
+    ViewDeps::Result::ANameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('a_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM artist WHERE name like 'a%'"
+);
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDeps::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/AbNameArtists.pm b/t/lib/ViewDeps/Result/AbNameArtists.pm
new file mode 100644 (file)
index 0000000..3651a5b
--- /dev/null
@@ -0,0 +1,28 @@
+package    # hide from PAUSE
+    ViewDeps::Result::AbNameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('ab_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM a_name_artists WHERE name like 'ab%'"
+);
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDeps::Result::ANameArtists"]
+);
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDeps::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/AbaNameArtists.pm b/t/lib/ViewDeps/Result/AbaNameArtists.pm
new file mode 100644 (file)
index 0000000..fc989f6
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDeps::Result::AbaNameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('aba_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM ab_name_artists WHERE name like 'aba%'" );
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDeps::Result::AbNameArtists"] );
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDeps::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/AbaNameArtistsAnd2010CDsWithManyTracks.pm b/t/lib/ViewDeps/Result/AbaNameArtistsAnd2010CDsWithManyTracks.pm
new file mode 100644 (file)
index 0000000..83c651b
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDeps::Result::AbaNameArtistsAnd2010CDsWithManyTracks;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('aba_name_artists_and_2010_cds_with_many_tracks');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT aba.id,aba.name,cd.title,cd.year,cd.number_tracks FROM aba_name_artists aba JOIN year_2010_cds_with_many_tracks cd on (aba.id = cd.artist)"
+);
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDeps::Result::AbNameArtists","ViewDeps::Result::Year2010CDsWithManyTracks"] );
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    name          => { data_type => 'text' },
+    title         => { data_type => 'text' },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+1;
diff --git a/t/lib/ViewDeps/Result/Artist.pm b/t/lib/ViewDeps/Result/Artist.pm
new file mode 100644 (file)
index 0000000..276288d
--- /dev/null
@@ -0,0 +1,21 @@
+package    # hide from PAUSE
+    ViewDeps::Result::Artist;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('artist');
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDeps::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/Artwork.pm b/t/lib/ViewDeps/Result/Artwork.pm
new file mode 100644 (file)
index 0000000..056bdb8
--- /dev/null
@@ -0,0 +1,22 @@
+package    # hide from PAUSE
+    ViewDeps::Result::Artwork;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('artwork');
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    cd         => { data_type => 'integer' },
+    file          => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'cd', 'ViewDeps::Result::CD',
+    { "foreign.id" => "self.cd" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/CD.pm b/t/lib/ViewDeps/Result/CD.pm
new file mode 100644 (file)
index 0000000..c69f4b3
--- /dev/null
@@ -0,0 +1,28 @@
+package    # hide from PAUSE
+    ViewDeps::Result::CD;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('cd');
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    title         => { data_type => 'text' },
+    artist        => { data_type => 'integer', is_nullable       => 0 },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'artist', 'ViewDeps::Result::Artist',
+    { "foreign.id" => "self.artist" },
+);
+
+__PACKAGE__->has_many( 'tracks', 'ViewDeps::Result::Track',
+    { "foreign.cd" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/Track.pm b/t/lib/ViewDeps/Result/Track.pm
new file mode 100644 (file)
index 0000000..62b1b99
--- /dev/null
@@ -0,0 +1,23 @@
+package    # hide from PAUSE
+    ViewDeps::Result::Track;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('track');
+
+__PACKAGE__->add_columns(
+    id           => { data_type => 'integer', is_auto_increment => 1 },
+    title        => { data_type => 'text' },
+    cd           => { data_type => 'integer' },
+    track_number => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'cd', 'ViewDeps::Result::CD',
+    { "foreign.id" => "self.cd" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/TrackNumberFives.pm b/t/lib/ViewDeps/Result/TrackNumberFives.pm
new file mode 100644 (file)
index 0000000..fc4a47b
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDeps::Result::TrackNumberFives;
+
+use strict;
+use warnings;
+use base 'ViewDeps::Result::Track';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('track_number_fives');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,title,cd,track_number FROM track WHERE track_number = '5'");
+
+__PACKAGE__->add_columns(
+    id           => { data_type => 'integer', is_auto_increment => 1 },
+    title        => { data_type => 'text' },
+    cd           => { data_type => 'integer' },
+    track_number => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'cd', 'ViewDeps::Result::CD',
+    { "foreign.id" => "self.cd" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/Year2010CDs.pm b/t/lib/ViewDeps/Result/Year2010CDs.pm
new file mode 100644 (file)
index 0000000..2706fae
--- /dev/null
@@ -0,0 +1,31 @@
+package    # hide from PAUSE
+    ViewDeps::Result::Year2010CDs;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('year_2010_cds');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,title,artist,year,number_tracks FROM cd WHERE year = '2010'");
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    title         => { data_type => 'text' },
+    artist        => { data_type => 'integer', is_nullable       => 0 },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'artist', 'ViewDeps::Result::Artist',
+    { "foreign.id" => "self.artist" },
+);
+
+__PACKAGE__->has_many( 'tracks', 'ViewDeps::Result::Track',
+    { "foreign.cd" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDeps/Result/Year2010CDsWithManyTracks.pm b/t/lib/ViewDeps/Result/Year2010CDsWithManyTracks.pm
new file mode 100644 (file)
index 0000000..c6e4144
--- /dev/null
@@ -0,0 +1,36 @@
+package    # hide from PAUSE
+    ViewDeps::Result::Year2010CDsWithManyTracks;
+
+use strict;
+use warnings;
+use base 'ViewDeps::Result::Year2010CDs';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('year_2010_cds_with_many_tracks');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT cd.id,cd.title,cd.artist,cd.year,cd.number_tracks,art.file FROM year_2010_cds cd JOIN artwork art on art.cd = cd.id WHERE cd.number_tracks > 10"
+);
+
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDeps::Result::Year2010CDs"] );
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    title         => { data_type => 'text' },
+    artist        => { data_type => 'integer', is_nullable       => 0 },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+    file       => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'artist', 'ViewDeps::Result::Artist',
+    { "foreign.id" => "self.artist" },
+);
+
+__PACKAGE__->has_many( 'tracks', 'ViewDeps::Result::Track',
+    { "foreign.cd" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad.pm b/t/lib/ViewDepsBad.pm
new file mode 100644 (file)
index 0000000..9b5be12
--- /dev/null
@@ -0,0 +1,16 @@
+package    # hide from PAUSE
+    ViewDepsBad;
+## Used in 105view_deps.t
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Schema';
+
+__PACKAGE__->load_namespaces;
+
+sub sqlt_deploy_hook {
+    my $self = shift;
+    $self->{sqlt} = shift;
+}
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/ANameArtists.pm b/t/lib/ViewDepsBad/Result/ANameArtists.pm
new file mode 100644 (file)
index 0000000..8d16ae9
--- /dev/null
@@ -0,0 +1,25 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::ANameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('a_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM artist WHERE name like 'a%'"
+);
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDeps::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/AbNameArtists.pm b/t/lib/ViewDepsBad/Result/AbNameArtists.pm
new file mode 100644 (file)
index 0000000..181d4ec
--- /dev/null
@@ -0,0 +1,28 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::AbNameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('ab_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM a_name_artists WHERE name like 'ab%'"
+);
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDepsBad::Result::ANameArtists"]
+);
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDepsBad::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/AbaNameArtists.pm b/t/lib/ViewDepsBad/Result/AbaNameArtists.pm
new file mode 100644 (file)
index 0000000..715d56d
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::AbaNameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('aba_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM ab_name_artists WHERE name like 'aba%'" );
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDepsBad::Result::AbNameArtists", "ViewDepsBad::Result::AbaNameArtistsAnd2010CDsWithManyTracks"] );
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDepsBad::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/AbaNameArtists.pm~ b/t/lib/ViewDepsBad/Result/AbaNameArtists.pm~
new file mode 100644 (file)
index 0000000..fc989f6
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDeps::Result::AbaNameArtists;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('aba_name_artists');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,name FROM ab_name_artists WHERE name like 'aba%'" );
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDeps::Result::AbNameArtists"] );
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDeps::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/AbaNameArtistsAnd2010CDsWithManyTracks.pm b/t/lib/ViewDepsBad/Result/AbaNameArtistsAnd2010CDsWithManyTracks.pm
new file mode 100644 (file)
index 0000000..8751d57
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::AbaNameArtistsAnd2010CDsWithManyTracks;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('aba_name_artists_and_2010_cds_with_many_tracks');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT aba.id,aba.name,cd.title,cd.year,cd.number_tracks FROM aba_name_artists aba JOIN year_2010_cds_with_many_tracks cd on (aba.id = cd.artist)"
+);
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDepsBad::Result::AbNameArtists","ViewDepsBad::Result::Year2010CDsWithManyTracks"] );
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    name          => { data_type => 'text' },
+    title         => { data_type => 'text' },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/Artist.pm b/t/lib/ViewDepsBad/Result/Artist.pm
new file mode 100644 (file)
index 0000000..6d7a0f5
--- /dev/null
@@ -0,0 +1,21 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::Artist;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('artist');
+
+__PACKAGE__->add_columns(
+    id   => { data_type => 'integer', is_auto_increment => 1 },
+    name => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->has_many( 'cds', 'ViewDepsBad::Result::CD',
+    { "foreign.artist" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/Artwork.pm b/t/lib/ViewDepsBad/Result/Artwork.pm
new file mode 100644 (file)
index 0000000..978e196
--- /dev/null
@@ -0,0 +1,22 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::Artwork;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('artwork');
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    cd         => { data_type => 'integer' },
+    file          => { data_type => 'text' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'cd', 'ViewDepsBad::Result::CD',
+    { "foreign.id" => "self.cd" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/CD.pm b/t/lib/ViewDepsBad/Result/CD.pm
new file mode 100644 (file)
index 0000000..ea40b84
--- /dev/null
@@ -0,0 +1,28 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::CD;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('cd');
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    title         => { data_type => 'text' },
+    artist        => { data_type => 'integer', is_nullable       => 0 },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'artist', 'ViewDepsBad::Result::Artist',
+    { "foreign.id" => "self.artist" },
+);
+
+__PACKAGE__->has_many( 'tracks', 'ViewDepsBad::Result::Track',
+    { "foreign.cd" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/Track.pm b/t/lib/ViewDepsBad/Result/Track.pm
new file mode 100644 (file)
index 0000000..0ff97f2
--- /dev/null
@@ -0,0 +1,23 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::Track;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table('track');
+
+__PACKAGE__->add_columns(
+    id           => { data_type => 'integer', is_auto_increment => 1 },
+    title        => { data_type => 'text' },
+    cd           => { data_type => 'integer' },
+    track_number => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'cd', 'ViewDepsBad::Result::CD',
+    { "foreign.id" => "self.cd" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/TrackNumberFives.pm b/t/lib/ViewDepsBad/Result/TrackNumberFives.pm
new file mode 100644 (file)
index 0000000..ce09b80
--- /dev/null
@@ -0,0 +1,26 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::TrackNumberFives;
+
+use strict;
+use warnings;
+use base 'ViewDepsBad::Result::Track';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('track_number_fives');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,title,cd,track_number FROM track WHERE track_number = '5'");
+
+__PACKAGE__->add_columns(
+    id           => { data_type => 'integer', is_auto_increment => 1 },
+    title        => { data_type => 'text' },
+    cd           => { data_type => 'integer' },
+    track_number => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'cd', 'ViewDepsBad::Result::CD',
+    { "foreign.id" => "self.cd" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/Year2010CDs.pm b/t/lib/ViewDepsBad/Result/Year2010CDs.pm
new file mode 100644 (file)
index 0000000..8771ad9
--- /dev/null
@@ -0,0 +1,31 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::Year2010CDs;
+
+use strict;
+use warnings;
+use base 'DBIx::Class::Core';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('year_2010_cds');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT id,title,artist,year,number_tracks FROM cd WHERE year = '2010'");
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    title         => { data_type => 'text' },
+    artist        => { data_type => 'integer', is_nullable       => 0 },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'artist', 'ViewDepsBad::Result::Artist',
+    { "foreign.id" => "self.artist" },
+);
+
+__PACKAGE__->has_many( 'tracks', 'ViewDepsBad::Result::Track',
+    { "foreign.cd" => "self.id" },
+);
+
+1;
diff --git a/t/lib/ViewDepsBad/Result/Year2010CDsWithManyTracks.pm b/t/lib/ViewDepsBad/Result/Year2010CDsWithManyTracks.pm
new file mode 100644 (file)
index 0000000..9a4900f
--- /dev/null
@@ -0,0 +1,36 @@
+package    # hide from PAUSE
+    ViewDepsBad::Result::Year2010CDsWithManyTracks;
+
+use strict;
+use warnings;
+use base 'ViewDepsBad::Result::Year2010CDs';
+
+__PACKAGE__->table_class('DBIx::Class::ResultSource::View');
+__PACKAGE__->table('year_2010_cds_with_many_tracks');
+__PACKAGE__->result_source_instance->view_definition(
+    "SELECT cd.id,cd.title,cd.artist,cd.year,cd.number_tracks,art.file FROM year_2010_cds cd JOIN artwork art on art.cd = cd.id WHERE cd.number_tracks > 10"
+);
+
+__PACKAGE__->result_source_instance->deploy_depends_on(
+    ["ViewDepsBad::Result::Year2010CDs"] );
+
+__PACKAGE__->add_columns(
+    id            => { data_type => 'integer', is_auto_increment => 1 },
+    title         => { data_type => 'text' },
+    artist        => { data_type => 'integer', is_nullable       => 0 },
+    year          => { data_type => 'integer' },
+    number_tracks => { data_type => 'integer' },
+    file       => { data_type => 'integer' },
+);
+
+__PACKAGE__->set_primary_key('id');
+
+__PACKAGE__->belongs_to( 'artist', 'ViewDepsBad::Result::Artist',
+    { "foreign.id" => "self.artist" },
+);
+
+__PACKAGE__->has_many( 'tracks', 'ViewDepsBad::Result::Track',
+    { "foreign.cd" => "self.id" },
+);
+
+1;