Theoretically this should fix the problem (but it doesn't)

frioux · Feb 18, 2016 · e858028 · e858028
1 parent 2ca43b9
commit e858028
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 47 deletions.
diff --git a/lib/DBIx/Class/Helper/ResultSet.pm b/lib/DBIx/Class/Helper/ResultSet.pm
@@ -2,18 +2,20 @@ package DBIx::Class::Helper::ResultSet;
 
 # ABSTRACT: All the ResultSet Helpers in one place
 
-use parent qw{
-   DBIx::Class::Helper::ResultSet::AutoRemoveColumns
-   DBIx::Class::Helper::ResultSet::CorrelateRelationship
-   DBIx::Class::Helper::ResultSet::IgnoreWantarray
-   DBIx::Class::Helper::ResultSet::Me
-   DBIx::Class::Helper::ResultSet::NoColumns
-   DBIx::Class::Helper::ResultSet::Random
-   DBIx::Class::Helper::ResultSet::RemoveColumns
-   DBIx::Class::Helper::ResultSet::ResultClassDWIM
-   DBIx::Class::Helper::ResultSet::SearchOr
-   DBIx::Class::Helper::ResultSet::SetOperations
-   DBIx::Class::Helper::ResultSet::Shortcut
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components(qw{
+   Helper::ResultSet::AutoRemoveColumns
+   Helper::ResultSet::CorrelateRelationship
+   Helper::ResultSet::IgnoreWantarray
+   Helper::ResultSet::Me
+   Helper::ResultSet::NoColumns
+   Helper::ResultSet::Random
+   Helper::ResultSet::RemoveColumns
+   Helper::ResultSet::ResultClassDWIM
+   Helper::ResultSet::SearchOr
+   Helper::ResultSet::SetOperations
+   Helper::ResultSet::Shortcut
 };
 
 1;

diff --git a/lib/DBIx/Class/Helper/ResultSet/AutoRemoveColumns.pm b/lib/DBIx/Class/Helper/ResultSet/AutoRemoveColumns.pm
@@ -5,7 +5,9 @@ package DBIx::Class::Helper::ResultSet::AutoRemoveColumns;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::RemoveColumns', 'DBIx::Class::ResultSet';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::RemoveColumns');
 
 __PACKAGE__->mk_group_accessors(inherited => '_fetchable_columns');
 

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut.pm
@@ -5,21 +5,23 @@ package DBIx::Class::Helper::ResultSet::Shortcut;
 use strict;
 use warnings;
 
-use parent (qw(
-   DBIx::Class::Helper::ResultSet::Shortcut::AddColumns
-   DBIx::Class::Helper::ResultSet::Shortcut::Columns
-   DBIx::Class::Helper::ResultSet::Shortcut::Distinct
-   DBIx::Class::Helper::ResultSet::Shortcut::GroupBy
-   DBIx::Class::Helper::ResultSet::Shortcut::HasRows
-   DBIx::Class::Helper::ResultSet::Shortcut::HRI
-   DBIx::Class::Helper::ResultSet::Shortcut::Limit
-   DBIx::Class::Helper::ResultSet::Shortcut::OrderByMagic
-   DBIx::Class::Helper::ResultSet::Shortcut::Prefetch
-   DBIx::Class::Helper::ResultSet::Shortcut::LimitedPage
-   DBIx::Class::Helper::ResultSet::Shortcut::ResultsExist
-   DBIx::Class::Helper::ResultSet::Shortcut::Rows
-   DBIx::Class::Helper::ResultSet::Shortcut::Page
-   DBIx::Class::Helper::ResultSet::Shortcut::Search
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components(qw(
+   Helper::ResultSet::Shortcut::AddColumns
+   Helper::ResultSet::Shortcut::Columns
+   Helper::ResultSet::Shortcut::Distinct
+   Helper::ResultSet::Shortcut::GroupBy
+   Helper::ResultSet::Shortcut::HasRows
+   Helper::ResultSet::Shortcut::HRI
+   Helper::ResultSet::Shortcut::Limit
+   Helper::ResultSet::Shortcut::OrderByMagic
+   Helper::ResultSet::Shortcut::Prefetch
+   Helper::ResultSet::Shortcut::LimitedPage
+   Helper::ResultSet::Shortcut::ResultsExist
+   Helper::ResultSet::Shortcut::Rows
+   Helper::ResultSet::Shortcut::Page
+   Helper::ResultSet::Shortcut::Search
 ));
 
 1;

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/HasRows.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/HasRows.pm
@@ -3,7 +3,9 @@ package DBIx::Class::Helper::ResultSet::Shortcut::HasRows;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::Shortcut::Rows', 'DBIx::Class::ResultSet';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::Shortcut::Rows');
 
 sub has_rows { !! shift->rows(1)->next }
 

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/Limit.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/Limit.pm
@@ -3,7 +3,9 @@ package DBIx::Class::Helper::ResultSet::Shortcut::Limit;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::Shortcut::Rows', 'DBIx::Class::ResultSet';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::Shortcut::Rows');
 
 sub limit { return shift->rows(@_) }
 

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/LimitedPage.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/LimitedPage.pm
@@ -3,11 +3,12 @@ package DBIx::Class::Helper::ResultSet::Shortcut::LimitedPage;
 use strict;
 use warnings;
 
-use parent qw(
-  DBIx::Class::Helper::ResultSet::Shortcut::Rows
-  DBIx::Class::Helper::ResultSet::Shortcut::Page
-  DBIx::Class::ResultSet
-);
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components(qw(
+  Helper::ResultSet::Shortcut::Rows
+  Helper::ResultSet::Shortcut::Page
+));
 
 sub limited_page {
   my $self = shift;

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/OrderByMagic.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/OrderByMagic.pm
@@ -3,7 +3,9 @@ package DBIx::Class::Helper::ResultSet::Shortcut::OrderByMagic;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::Shortcut::OrderBy', 'DBIx::Class::ResultSet';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::Shortcut::OrderBy');
 
 sub order_by {
     my ($self, @order) = @_;

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search.pm
@@ -3,11 +3,13 @@ package DBIx::Class::Helper::ResultSet::Shortcut::Search;
 use strict;
 use warnings;
 
-use parent (qw(
-   DBIx::Class::Helper::ResultSet::Shortcut::Search::Null
-   DBIx::Class::Helper::ResultSet::Shortcut::Search::NotNull
-   DBIx::Class::Helper::ResultSet::Shortcut::Search::Like
-   DBIx::Class::Helper::ResultSet::Shortcut::Search::NotLike
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components(qw(
+   Helper::ResultSet::Shortcut::Search::Null
+   Helper::ResultSet::Shortcut::Search::NotNull
+   Helper::ResultSet::Shortcut::Search::Like
+   Helper::ResultSet::Shortcut::Search::NotLike
 ));
 
 1;
diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search/Like.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search/Like.pm
@@ -3,7 +3,9 @@ package DBIx::Class::Helper::ResultSet::Shortcut::Search::Like;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::Shortcut::Search::Base';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::Shortcut::Search::Base');
 
 =head2 like($column || \@columns, $cond)
 

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search/NotLike.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search/NotLike.pm
@@ -3,7 +3,9 @@ package DBIx::Class::Helper::ResultSet::Shortcut::Search::NotLike;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::Shortcut::Search::Base';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::Shortcut::Search::Base');
 
 =head2 not_like($column || \@columns, $cond)
 

diff --git a/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search/NotNull.pm b/lib/DBIx/Class/Helper/ResultSet/Shortcut/Search/NotNull.pm
@@ -3,7 +3,9 @@ package DBIx::Class::Helper::ResultSet::Shortcut::Search::NotNull;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::ResultSet::Shortcut::Search::Base';
+use parent 'DBIx::Class::ResultSet';
+
+__PACKAGE__->load_components('Helper::ResultSet::Shortcut::Search::Base');
 
 =head2 not_null(@columns || \@columns)
 

diff --git a/lib/DBIx/Class/Helper/Row/OnColumnChange.pm b/lib/DBIx/Class/Helper/Row/OnColumnChange.pm
@@ -5,7 +5,9 @@ package DBIx::Class::Helper::Row::OnColumnChange;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::Row::StorageValues', 'DBIx::Class::Row';
+use parent 'DBIx::Class';
+
+__PACKAGE__->load_components('Helper::Row::StorageValues', 'Row');
 
 use List::Util 'first';
 use DBIx::Class::Candy::Exports;

diff --git a/lib/DBIx/Class/Helper/Row/ProxyResultSetMethod.pm b/lib/DBIx/Class/Helper/Row/ProxyResultSetMethod.pm
@@ -5,7 +5,9 @@ package DBIx::Class::Helper::Row::ProxyResultSetMethod;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::Row::SelfResultSet', 'DBIx::Class::Row';
+use parent 'DBIx::Class';
+
+__PACKAGE__->load_components('Helper::Row::SelfResultSet', 'Row');
 
 use Sub::Name ();
 

diff --git a/lib/DBIx/Class/Helper/Row/ProxyResultSetUpdate.pm b/lib/DBIx/Class/Helper/Row/ProxyResultSetUpdate.pm
@@ -5,7 +5,9 @@ package DBIx::Class::Helper::Row::ProxyResultSetUpdate;
 use strict;
 use warnings;
 
-use parent 'DBIx::Class::Helper::Row::SelfResultSet', 'DBIx::Class::Row';
+use parent 'DBIx::Class';
+
+__PACKAGE__->load_components('Helper::Row::SelfResultSet', 'Row');
 
 sub update {
   my ($self, $upd) = @_;