X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=62d93a28edb81b69544c3391b1df81b2b7a6fe29;hb=9b465d002d544e25ae5756304c4ea59577aca363;hp=08282df3c483f84ca9c07b61052990816633b183;hpb=1385b8e4e4aaf3f80210441bba5992756e56ae44;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index 08282df..62d93a2 100644
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -1,16 +1,31 @@
 package DBIx::Class::DB;
 
 use base qw/DBIx::Class/;
+use DBIx::Class::Schema;
 use DBIx::Class::Storage::DBI;
 use DBIx::Class::ClassResolver::PassThrough;
 use DBI;
 
-*dbi_commit = \&tx_commit;
-*dbi_rollback = \&tx_rollback;
+__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;
+}
 
 =head1 NAME 
 
-DBIx::Class::DB - Simple DBIx::Class Database connection by class inheritance
+DBIx::Class::DB - Non-recommended classdata schema component
 
 =head1 SYNOPSIS
 
@@ -24,13 +39,16 @@ DBIx::Class::DB - Simple DBIx::Class Database connection by class inheritance
   package MyDB::MyTable;
 
   use base qw/MyDB/;
-  __PACKAGE__->load_components('Core');
+  __PACKAGE__->load_components('Core'); # just load this in MyDB if it will always be there
 
   ...
 
 =head1 DESCRIPTION
 
-This class provides a simple way of specifying a database connection.
+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.
 
 =head1 METHODS
 
@@ -40,15 +58,16 @@ Sets or gets the storage backend. Defaults to L<DBIx::Class::Storage::DBI>.
 
 =head2 class_resolver
 
+****DEPRECATED****
+
 Sets or gets the class to use for resolving a class. Defaults to 
 L<DBIx::Class::ClassResolver::Passthrough>, which returns whatever you give
 it. See resolve_class below.
 
 =cut
 
-__PACKAGE__->mk_classdata('storage');
 __PACKAGE__->mk_classdata('class_resolver' =>
-                            'DBIx::Class::ClassResolver::PassThrough');
+                          'DBIx::Class::ClassResolver::PassThrough');
 
 =head2 connection
 
@@ -61,36 +80,68 @@ instantiate the class dbh when required.
 
 sub connection {
   my ($class, @info) = @_;
-  my $storage = DBIx::Class::Storage::DBI->new;
-  $storage->connect_info(\@info);
-  $class->storage($storage);
+  $class->setup_schema_instance unless $class->can('schema_instance');
+  $class->schema_instance->connection(@info);
+}
+
+=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
+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.
+
+=cut
+
+sub setup_schema_instance {
+  my $class = shift;
+  my $schema = bless({}, 'DBIx::Class::Schema');
+  $class->mk_classdata('schema_instance' => $schema);
 }
 
-=head2 tx_begin
+=head2 txn_begin
 
 Begins a transaction (does nothing if AutoCommit is off).
 
 =cut
 
-sub tx_commit { $_[0]->storage->tx_begin }
+sub txn_begin { shift->schema_instance->txn_begin(@_); }
 
-=head2 tx_commit
+=head2 txn_commit
 
 Commits the current transaction.
 
 =cut
 
-sub tx_commit { $_[0]->storage->tx_commit }
+sub txn_commit { shift->schema_instance->txn_commit(@_); }
 
-=head2 tx_rollback
+=head2 txn_rollback
 
 Rolls back the current transaction.
 
 =cut
 
-sub tx_rollback { $_[0]->storage->tx_rollback }
+sub txn_rollback { shift->schema_instance->txn_rollback(@_); }
+
+=head2 txn_do
 
-sub resolve_class { return shift->class_resolver->class(@_); }
+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<DBIx::Class::Schema> for more details.
+
+=cut
+
+sub txn_do { shift->schema_instance->txn_do(@_); }
+
+{
+  my $warn;
+
+  sub resolve_class {
+    warn "resolve_class deprecated as of 0.04999_02" unless $warn++;
+    return shift->class_resolver->class(@_);
+  }
+}
 
 1;