X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=93eec5804e261fc25a24bd48408744fcb03eaa6d;hb=0a7eddc0faa5889d647509ade1018b1b39e964f2;hp=62978504a71a52bb706eb10ac731fa18bd61c114;hpb=e60dc79fcd4d6318e83584b826526e65048b86a9;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm index 6297850..93eec58 100644 --- a/lib/DBIx/Class/DB.pm +++ b/lib/DBIx/Class/DB.pm @@ -8,7 +8,8 @@ use DBIx::Class::Schema; use DBIx::Class::Storage::DBI; use DBIx::Class::ClassResolver::PassThrough; use DBI; -use Scalar::Util; +use Scalar::Util 'blessed'; +use namespace::clean; unless ($INC{"DBIx/Class/CDBICompat.pm"}) { warn "IMPORTANT: DBIx::Class::DB is DEPRECATED AND *WILL* BE REMOVED. DO NOT USE.\n"; @@ -16,13 +17,9 @@ unless ($INC{"DBIx/Class/CDBICompat.pm"}) { __PACKAGE__->load_components(qw/ResultSetProxy/); -{ - no warnings 'once'; - *dbi_commit = \&txn_commit; - *dbi_rollback = \&txn_rollback; -} - sub storage { shift->schema_instance(@_)->storage; } +sub dbi_commit { shift->txn_commit(@_) } +sub dbi_rollback { shift->txn_rollback(@_) } =head1 NAME @@ -36,15 +33,19 @@ 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 -=head2 storage +Hidden. + +=begin hidden head2 storage Sets or gets the storage backend. Defaults to L. -=head2 class_resolver +=end hidden + +=cut + +=begin hidden head2 class_resolver ****DEPRECATED**** @@ -52,18 +53,22 @@ 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' => 'DBIx::Class::ClassResolver::PassThrough'); -=head2 connection +=begin hidden head2 connection __PACKAGE__->connection($dsn, $user, $pass, $attrs); Specifies the arguments that will be passed to DBI->connect(...) to instantiate the class dbh when required. +=end hidden + =cut sub connection { @@ -72,7 +77,7 @@ sub connection { $class->schema_instance->connection(@info); } -=head2 setup_schema_instance +=begin hidden head2 setup_schema_instance Creates a class method ->schema_instance which contains a DBIx::Class::Schema; all class-method operations are proxies through to this object. If you don't @@ -80,6 +85,8 @@ 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 { @@ -89,36 +96,44 @@ sub setup_schema_instance { $class->mk_classdata('schema_instance' => $schema); } -=head2 txn_begin +=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(@_); } -=head2 txn_commit +=begin hidden head2 txn_commit Commits the current transaction. +=end hidden + =cut sub txn_commit { shift->schema_instance->txn_commit(@_); } -=head2 txn_rollback +=begin hidden head2 txn_rollback Rolls back the current transaction. +=end hidden + =cut sub txn_rollback { shift->schema_instance->txn_rollback(@_); } -=head2 txn_do +=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 L for more details. +=end hidden + =cut sub txn_do { shift->schema_instance->txn_do(@_); } @@ -132,79 +147,99 @@ sub txn_do { shift->schema_instance->txn_do(@_); } } } -=head2 resultset_instance +=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 sub resultset_instance { $_[0]->result_source_instance->resultset } -=head2 result_source_instance +=begin hidden head2 result_source_instance Returns an instance of the result source for this class +=end hidden + =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; - - __PACKAGE__->mk_classdata(qw/_result_source_instance/) - unless __PACKAGE__->can('_result_source_instance'); - - - return $class->_result_source_instance(@_) if @_; - - my $source = $class->_result_source_instance; - return unless Scalar::Util::blessed($source); - - if ($source->result_class ne $class) { - # Remove old source instance so we dont get deep recursion - #$DB::single = 1; - # Need to set it to a non-undef value so that it doesn't just fallback to - # a parent class's _result_source_instance - #$class->_result_source_instance({}); - #$class->table($class); - #$source = $class->_result_source_instance; - - $DB::single = 1; - $source = $source->new({ - %$source, + + 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); - if (my $coderef = $class->can('schema_instance')) { - $coderef->($class)->register_class($class, $class); - } + $class->_result_source_instance([$source, $class]); + $class->_maybe_attach_source_to_schema($source); } return $source; } -=head2 resolve_class +=begin hidden head2 resolve_class ****DEPRECATED**** -See L +See L + +=end hidden -=head2 dbi_commit +=begin hidden head2 dbi_commit ****DEPRECATED**** -Alias for L +Alias for L + +=end hidden -=head2 dbi_rollback +=begin hidden head2 dbi_rollback ****DEPRECATED**** -Alias for L +Alias for L -=end HIDE_BECAUSE_THIS_CLASS_IS_DEPRECATED +=end hidden =head1 AUTHORS