use Scalar::Util 'blessed';
use namespace::clean;
-__PACKAGE__->mk_classdata(table_class => 'DBIx::Class::ResultSource::Table');
-
-__PACKAGE__->mk_classdata('table_alias'); # FIXME: Doesn't actually do
- # anything yet!
+# FIXME - both of these *PROBABLY* need to be 'inherited_ro_instance' type
+__PACKAGE__->mk_classaccessor(table_class => 'DBIx::Class::ResultSource::Table');
+# FIXME: Doesn't actually do anything yet!
+__PACKAGE__->mk_group_accessors( inherited => 'table_alias' );
sub _init_result_source_instance {
my $class = shift;
- $class->mk_classdata('result_source_instance')
- unless $class->can('result_source_instance');
+ $class->mk_group_accessors( inherited => 'result_source_instance' )
+ unless $class->can('result_source_instance');
+
+ # might be pre-made for us courtesy of DBIC::DB::result_source_instance()
+ my $rsrc = $class->result_source_instance;
- my $table = $class->result_source_instance;
- my $class_has_table_instance = ($table and $table->result_class eq $class);
- return $table if $class_has_table_instance;
+ return $rsrc
+ if $rsrc and $rsrc->result_class eq $class;
my $table_class = $class->table_class;
$class->ensure_class_loaded($table_class);
- if( $table ) {
- $table = $table_class->new({
- %$table,
+ if( $rsrc ) {
+ $rsrc = $table_class->new({
+ %$rsrc,
result_class => $class,
source_name => undef,
schema => undef
});
}
else {
- $table = $table_class->new({
+ $rsrc = $table_class->new({
name => undef,
result_class => $class,
source_name => undef,
});
}
- $class->result_source_instance($table);
-
- return $table;
+ $class->result_source_instance($rsrc);
}
=head1 NAME
=cut
sub table {
+ return $_[0]->result_source_instance->name unless @_ > 1;
+
my ($class, $table) = @_;
- return $class->result_source_instance->name unless $table;
unless (blessed $table && $table->isa($class->table_class)) {
});
}
- $class->mk_classdata('result_source_instance')
+ $class->mk_group_accessors(inherited => 'result_source_instance')
unless $class->can('result_source_instance');
- $class->result_source_instance($table);
-
- return $class->result_source_instance->name;
+ $class->result_source_instance($table)->name;
}
=head2 table_class