X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=235b6bf8ef82e27f06ee8747c4d2b0003777e2c8;hb=e50536940adf2ebaef907a0c29ae37fbd5ce95b1;hp=62d93a28edb81b69544c3391b1df81b2b7a6fe29;hpb=60283c2e81a0c2ec3ef9ee94350f1a620291e65a;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm index 62d93a2..235b6bf 100644 --- a/lib/DBIx/Class/DB.pm +++ b/lib/DBIx/Class/DB.pm @@ -1,74 +1,71 @@ 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 'blessed'; +use namespace::clean; -__PACKAGE__->load_components(qw/ResultSetProxy/); - -*dbi_commit = \&txn_commit; -*dbi_rollback = \&txn_rollback; - -sub storage { shift->schema_instance(@_)->storage; } - -sub resultset_instance { - my $class = ref $_[0] || $_[0]; - 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__->connection('dbi:...', 'user', 'pass', \%attrs); +__PACKAGE__->load_components(qw/ResultSetProxy/); - package MyDB::MyTable; +sub storage { shift->schema_instance(@_)->storage; } +sub dbi_commit { shift->txn_commit(@_) } +sub dbi_rollback { shift->txn_rollback(@_) } - 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 =head1 METHODS +Hidden. + +=begin hidden + =head2 storage Sets or gets the storage backend. Defaults to L. +=end hidden + +=cut + +=begin hidden + =head2 class_resolver ****DEPRECATED**** -Sets or gets the class to use for resolving a class. Defaults to +Sets or gets the class to use for resolving a class. Defaults to L, which returns whatever you give it. See resolve_class below. +=end hidden + =cut -__PACKAGE__->mk_classdata('class_resolver' => +__PACKAGE__->mk_classaccessor('class_resolver' => 'DBIx::Class::ClassResolver::PassThrough'); +=begin hidden + =head2 connection __PACKAGE__->connection($dsn, $user, $pass, $attrs); @@ -76,6 +73,8 @@ __PACKAGE__->mk_classdata('class_resolver' => Specifies the arguments that will be passed to DBI->connect(...) to instantiate the class dbh when required. +=end hidden + =cut sub connection { @@ -84,6 +83,8 @@ sub connection { $class->schema_instance->connection(@info); } +=begin hidden + =head2 setup_schema_instance Creates a class method ->schema_instance which contains a DBIx::Class::Schema; @@ -92,43 +93,62 @@ call ->connection in your DBIx::Class::DB subclass at load time you *must* call ->setup_schema_instance in order for subclasses to find the schema and register themselves with it. +=end hidden + =cut sub setup_schema_instance { my $class = shift; - my $schema = bless({}, 'DBIx::Class::Schema'); - $class->mk_classdata('schema_instance' => $schema); + my $schema = {}; + bless $schema, 'DBIx::Class::Schema'; + $class->mk_classaccessor('schema_instance' => $schema); } +=begin hidden + =head2 txn_begin Begins a transaction (does nothing if AutoCommit is off). +=end hidden + =cut sub txn_begin { shift->schema_instance->txn_begin(@_); } +=begin hidden + =head2 txn_commit Commits the current transaction. +=end hidden + =cut sub txn_commit { shift->schema_instance->txn_commit(@_); } +=begin hidden + =head2 txn_rollback Rolls back the current transaction. +=end hidden + =cut sub txn_rollback { shift->schema_instance->txn_rollback(@_); } +=begin hidden + =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 txn_do in L for more details. +is rethrown. See L for more details. + +=end hidden =cut @@ -143,15 +163,121 @@ sub txn_do { shift->schema_instance->txn_do(@_); } } } -1; +=begin hidden + +=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. + +=end hidden + +=cut -=head1 AUTHORS +sub resultset_instance { + $_[0]->result_source_instance->resultset +} -Matt S. Trout +=begin hidden -=head1 LICENSE +=head2 result_source_instance -You may distribute this code under the same terms as Perl itself. +Returns an instance of the result source for this class + +=end hidden =cut +__PACKAGE__->mk_classaccessor('_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 blessed $source; + + if ($result_class ne $class) { # new class + # Give this new class its 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; +} + +=begin hidden + +=head2 resolve_class + +****DEPRECATED**** + +See L + +=end hidden + +=begin hidden + +=head2 dbi_commit + +****DEPRECATED**** + +Alias for L + +=end hidden + +=begin hidden + +=head2 dbi_rollback + +****DEPRECATED**** + +Alias for L + +=end hidden + +=head1 FURTHER QUESTIONS? + +Check the list of L. + +=head1 COPYRIGHT AND LICENSE + +This module is free software L +by the L. You can +redistribute it and/or modify it under the same terms as the +L. + +=cut + +1;