Skip to content

Commit

Permalink
Merge 8e1cc70 into 00f5ce5
Browse files Browse the repository at this point in the history
  • Loading branch information
ribasushi committed Jul 28, 2016
2 parents 00f5ce5 + 8e1cc70 commit 56374a9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/RapidApp/DBIC/Component/VirtualColumns.pm
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,11 @@ column is virtual or not.
=cut

# keep as compat shim for 0.0828xx DBIC
sub column_info {
sub column_info :DBIC_method_is_indirect_sugar {
$_[0]->columns_info([ $_[1] ])->{$_[1]};
}

sub columns_info {
sub columns_info :DBIC_method_is_bypassable_resultsource_proxy {
my( $self, $colnames ) = @_;

my %virt_cols;
Expand Down
16 changes: 14 additions & 2 deletions lib/RapidApp/DBIC/Component/VirtualColumnsExt.pm
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
package RapidApp::DBIC::Component::VirtualColumnsExt;
use strict;
use warnings;

#use base 'DBIx::Class';
# this is for Attribute::Handlers:
require base; base->import('DBIx::Class');

use strict;
use warnings;
### FIXME - not sure why the above happens at runtime, but not digging in
### due to severe lack of time
###
### Still we need to apply the markers otherwise things will be *LOUD*
for my $m (qw( has_column columns )) {
attributes->import(
__PACKAGE__,
__PACKAGE__->can($m),
'DBIC_method_is_bypassable_resultsource_proxy',
);
}

use RapidApp::Util qw(:all);

Expand Down

0 comments on commit 56374a9

Please sign in to comment.