X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FModel%2FDBIC%2FSchema.pm;h=45392e98c7f6b5a157a6fd033e31fb3101797746;hb=d816d7bf6502a6c67912f1736705c6b55a43a518;hp=5ee32c96e06360cb6169f06159da079e04831055;hpb=cbe03ea7ec9a649973a404a41b3aa8d8f2ab4163;p=catagits%2FCatalyst-Model-DBIC-Schema.git diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm index 5ee32c9..45392e9 100644 --- a/lib/Catalyst/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Model/DBIC/Schema.pm @@ -5,7 +5,7 @@ use mro 'c3'; extends 'Catalyst::Model'; with 'CatalystX::Component::Traits'; -our $VERSION = '0.32'; +our $VERSION = '0.33'; $VERSION = eval $VERSION; use namespace::autoclean; @@ -14,7 +14,7 @@ use Data::Dumper; use DBIx::Class (); use Catalyst::Model::DBIC::Schema::Types - qw/ConnectInfo LoadedClass SchemaClass/; + qw/ConnectInfo LoadedClass SchemaClass Schema/; use MooseX::Types::Moose qw/ArrayRef Str ClassName Undef/; @@ -278,9 +278,10 @@ supported: Array of Traits to apply to the instance. Traits are Ls. -They are relative to the C<< MyApp::TraitFor::Model::DBIC::Schema:: >>, then the C<< -Catalyst::TraitFor::Model::DBIC::Schema:: >> namespaces, unless prefixed with C<+> -in which case they are taken to be a fully qualified name. E.g.: +They are relative to the C<< MyApp::TraitFor::Model::DBIC::Schema:: >>, then +the C<< Catalyst::TraitFor::Model::DBIC::Schema:: >> namespaces, unless +prefixed with C<+> in which case they are taken to be a fully qualified name. +E.g.: traits Caching traits +MyApp::TraitFor::Model::Foo @@ -288,6 +289,10 @@ in which case they are taken to be a fully qualified name. E.g.: A new instance is created at application time, so any consumed required attributes, coercions and modifiers will work. +By default, the L trait +is loaded. It can be disabled by specifying C<-SchemaProxy> in traits. See +L. + Traits are applied at L time using L. @@ -305,6 +310,8 @@ Traits that come with the distribution: =item L +=item L + =back =head2 storage_type @@ -403,6 +410,14 @@ Shortcut for ->schema->class Shortcut for ->schema->resultset +=head2 txn_do + +Shortcut for ->schema->txn_do + +=head2 txn_scope_guard + +Shortcut for ->schema->txn_scope_guard + =head2 storage Provides an accessor for the connected schema's storage object. @@ -410,6 +425,10 @@ Used often for debugging and controlling transactions. =cut +has '+_trait_merge' => (default => 1); + +__PACKAGE__->config->{traits} = ['SchemaProxy']; + has schema_class => ( is => 'ro', isa => SchemaClass, @@ -435,6 +454,8 @@ has _default_cursor_class => ( coerce => 1 ); +has schema => (is => 'rw', isa => Schema); + sub BUILD { my ($self, $args) = @_; my $class = $self->_original_class_name; @@ -458,41 +479,42 @@ sub BUILD { . " ".$self->connect_info->{cursor_class}.": $@"; } - $self->setup; + $self->setup($args); - $self->composed_schema($schema_class->compose_namespace($class)); + my $is_installed = defined $self->composed_schema; - my $was_mutable = $self->meta->is_mutable; - - $self->meta->make_mutable; - $self->meta->add_attribute('schema', - is => 'rw', - isa => 'DBIx::Class::Schema', - handles => $self->_delegates - ); - $self->meta->make_immutable unless $was_mutable; + $self->composed_schema($schema_class->compose_namespace($class)) + unless $is_installed; $self->schema($self->composed_schema->clone); - $self->_pass_options_to_schema($args); - $self->schema->storage_type($self->storage_type) if $self->storage_type; $self->schema->connection($self->connect_info); - $self->_install_rs_models; + $self->_install_rs_models unless $is_installed; } sub clone { shift->composed_schema->clone(@_); } sub connect { shift->composed_schema->connect(@_); } +# proxy methods, for when the SchemaProxy trait isn't loaded + +sub resultset { shift->schema->resultset(@_); } + +sub txn_do { shift->schema->txn_do(@_); } + +sub txn_scope_guard { shift->schema->txn_scope_guard(@_); } + =head2 setup Called at C time before configuration, but after L is set. To do something after configuuration use C<< after BUILD => >>. +Receives a hashref of args passed to C. + =cut sub setup { 1 } @@ -565,55 +587,6 @@ sub _build_model_name { return $model_name; } -sub _delegates { - my $self = shift; - - my $schema_meta = Class::MOP::Class->initialize($self->schema_class); - my @schema_methods = $schema_meta->get_all_method_names; - -# combine with any already added by other schemas - my @handles = eval { - @{ $self->meta->find_attribute_by_name('schema')->handles } - }; - -# now kill the attribute, otherwise add_attribute in BUILD will not do the right -# thing (it clears the handles for some reason.) May be a Moose bug. - eval { $self->meta->remove_attribute('schema') }; - - my %schema_methods; - @schema_methods{ @schema_methods, @handles } = (); - @schema_methods = keys %schema_methods; - - my @my_methods = $self->meta->get_all_method_names; - my %my_methods; - @my_methods{@my_methods} = (); - - my @delegates; - for my $method (@schema_methods) { - push @delegates, $method unless exists $my_methods{$method}; - } - - return \@delegates; -} - -sub _pass_options_to_schema { - my ($self, $args) = @_; - - my @attributes = map { - $_->init_arg || () - } $self->meta->get_all_attributes; - - my %attributes; - @attributes{@attributes} = (); - - for my $opt (keys %$args) { - if (not exists $attributes{$opt}) { - next unless $self->schema->can($opt); - $self->schema->$opt($self->{$opt}); - } - } -} - __PACKAGE__->meta->make_immutable; =head1 ENVIRONMENT @@ -675,6 +648,7 @@ Traits: L, L, +L, L =head1 AUTHOR @@ -695,6 +669,8 @@ osfameron: C ozum: Ozum Eldogan C +Pavel I. Shaydo C + =head1 COPYRIGHT Copyright (c) 2006 - 2009