X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=93e4472bc18d5ce921cc495bdd711c016c7a799f;hb=d4daee7b54e38e4b3d3d0a77759bddc1a4ede6e5;hp=0fdb1844e9424380a91604dcf9808539e7c3b641;hpb=08b515f102fb7e5780512ca541f539bc75e662be;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm index 0fdb184..93e4472 100644 --- a/lib/DBIx/Class/DB.pm +++ b/lib/DBIx/Class/DB.pm @@ -1,54 +1,42 @@ package DBIx::Class::DB; +use strict; +use warnings; + use base qw/DBIx::Class/; use DBIx::Class::Schema; use DBIx::Class::Storage::DBI; use DBIx::Class::ClassResolver::PassThrough; use DBI; +use Scalar::Util; -__PACKAGE__->load_components(qw/ResultSetProxy/); - -*dbi_commit = \&txn_commit; -*dbi_rollback = \&txn_rollback; - -sub storage { shift->schema_instance(@_)->storage; } - -sub resultset_instance { - my $class = shift; - my $source = $class->result_source_instance; - if ($source->result_class ne $class) { - $source = $source->new($source); - $source->result_class($class); - } - return $source->resultset; +unless ($INC{"DBIx/Class/CDBICompat.pm"}) { + warn "IMPORTANT: DBIx::Class::DB is DEPRECATED AND *WILL* BE REMOVED. DO NOT USE.\n"; } -=head1 NAME - -DBIx::Class::DB - Non-recommended classdata schema component - -=head1 SYNOPSIS - - package MyDB; - - use base qw/DBIx::Class/; - __PACKAGE__->load_components('DB'); +__PACKAGE__->load_components(qw/ResultSetProxy/); - __PACKAGE__->connection('dbi:...', 'user', 'pass', \%attrs); +{ + no warnings 'once'; + *dbi_commit = \&txn_commit; + *dbi_rollback = \&txn_rollback; +} - package MyDB::MyTable; +sub storage { shift->schema_instance(@_)->storage; } - use base qw/MyDB/; - __PACKAGE__->load_components('Core'); # just load this in MyDB if it will always be there +=head1 NAME - ... +DBIx::Class::DB - (DEPRECATED) classdata schema component =head1 DESCRIPTION This class is designed to support the Class::DBI connection-as-classdata style for DBIx::Class. You are *strongly* recommended to use a DBIx::Class::Schema -instead; DBIx::Class::DB will continue to be supported but new development -will be focused on Schema-based DBIx::Class setups. +instead; DBIx::Class::DB will not undergo new development and will be moved +to being a CDBICompat-only component before 1.0. In order to discourage further +use, documentation has been removed as of 0.08000 + +=begin HIDE_BECAUSE_THIS_CLASS_IS_DEPRECATED =head1 METHODS @@ -56,16 +44,18 @@ will be focused on Schema-based DBIx::Class setups. Sets or gets the storage backend. Defaults to L. -=head2 class_resolver ****DEPRECATED**** +=head2 class_resolver -Sets or gets the class to use for resolving a class. Defaults to +****DEPRECATED**** + +Sets or gets the class to use for resolving a class. Defaults to L, which returns whatever you give it. See resolve_class below. =cut __PACKAGE__->mk_classdata('class_resolver' => - 'DBIx::Class::ClassResolver::PassThrough'); + 'DBIx::Class::ClassResolver::PassThrough'); =head2 connection @@ -94,7 +84,8 @@ register themselves with it. sub setup_schema_instance { my $class = shift; - my $schema = bless({}, 'DBIx::Class::Schema'); + my $schema = {}; + bless $schema, 'DBIx::Class::Schema'; $class->mk_classdata('schema_instance' => $schema); } @@ -104,7 +95,7 @@ Begins a transaction (does nothing if AutoCommit is off). =cut -sub txn_begin { $_[0]->schema_instance->txn_begin } +sub txn_begin { shift->schema_instance->txn_begin(@_); } =head2 txn_commit @@ -112,7 +103,7 @@ Commits the current transaction. =cut -sub txn_commit { $_[0]->schema_instance->txn_commit } +sub txn_commit { shift->schema_instance->txn_commit(@_); } =head2 txn_rollback @@ -120,7 +111,17 @@ Rolls back the current transaction. =cut -sub txn_rollback { $_[0]->schema_instance->txn_rollback } +sub txn_rollback { shift->schema_instance->txn_rollback(@_); } + +=head2 txn_do + +Executes a block of code transactionally. If this code reference +throws an exception, the transaction is rolled back and the exception +is rethrown. See L for more details. + +=cut + +sub txn_do { shift->schema_instance->txn_do(@_); } { my $warn; @@ -131,7 +132,91 @@ sub txn_rollback { $_[0]->schema_instance->txn_rollback } } } -1; +=head2 resultset_instance + +Returns an instance of a resultset for this class - effectively +mapping the L connection-as-classdata paradigm into the +native L system. + +=cut + +sub resultset_instance { + $_[0]->result_source_instance->resultset +} + +=head2 result_source_instance + +Returns an instance of the result source for this class + +=cut + +__PACKAGE__->mk_classdata('_result_source_instance' => []); + +# Yep. this is horrific. Basically what's happening here is that +# (with good reason) DBIx::Class::Schema copies the result source for +# registration. Because we have a retarded setup order forced on us we need +# to actually make our ->result_source_instance -be- the source used, and we +# need to get the source name and schema into ourselves. So this makes it +# happen. + +sub _maybe_attach_source_to_schema { + my ($class, $source) = @_; + if (my $meth = $class->can('schema_instance')) { + if (my $schema = $class->$meth) { + $schema->register_class($class, $class); + my $new_source = $schema->source($class); + %$source = %$new_source; + $schema->source_registrations->{$class} = $source; + } + } +} + +sub result_source_instance { + my $class = shift; + $class = ref $class || $class; + + if (@_) { + my $source = $_[0]; + $class->_result_source_instance([$source, $class]); + $class->_maybe_attach_source_to_schema($source); + return $source; + } + + my($source, $result_class) = @{$class->_result_source_instance}; + return unless Scalar::Util::blessed($source); + + if ($result_class ne $class) { # new class + # Give this new class it's own source and register it. + $source = $source->new({ + %$source, + source_name => $class, + result_class => $class + } ); + $class->_result_source_instance([$source, $class]); + $class->_maybe_attach_source_to_schema($source); + } + return $source; +} + +=head2 resolve_class + +****DEPRECATED**** + +See L + +=head2 dbi_commit + +****DEPRECATED**** + +Alias for L + +=head2 dbi_rollback + +****DEPRECATED**** + +Alias for L + +=end HIDE_BECAUSE_THIS_CLASS_IS_DEPRECATED =head1 AUTHORS @@ -143,3 +228,4 @@ You may distribute this code under the same terms as Perl itself. =cut +1;