X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=3166c98b574009be69106866b9c79cd88c2f87f3;hb=5efe4c7916e1fb2132c1b73ab4ddddbced317adb;hp=7d1b5ca5817f7cb1abb5057b1fd21278b32f10de;hpb=076652e8bd5edaaf4c6c6a65f631bf529bbff41c;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index 7d1b5ca..3166c98 100644
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -1,10 +1,28 @@
 package DBIx::Class::DB;
 
-use base qw/Class::Data::Inheritable/;
+use base qw/DBIx::Class/;
+use DBIx::Class::Schema;
 use DBIx::Class::Storage::DBI;
 use DBIx::Class::ClassResolver::PassThrough;
 use DBI;
 
+__PACKAGE__->load_components(qw/ResultSetInstance/);
+
+*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;
+  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
@@ -21,7 +39,7 @@ 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
 
   ...
 
@@ -31,26 +49,22 @@ This class provides a simple way of specifying a database connection.
 
 =head1 METHODS
 
-=over 4
-
+=head2 storage
 
-=item storage
+Sets or gets the storage backend. Defaults to L<DBIx::Class::Storage::DBI>.
 
-Which storage backend to be used. Defaults to L<DBIx::Class::Storage::DBI>
+=head2 class_resolver ****DEPRECATED****
 
-=item class_resolver
-
-Which class to use for resolving a class. Defaults to 
-L<DBIx::Class::ClassResolver::Passthrough>, which returns whatever you throw
-at it. See resolve_class below.
+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');
 
-=item connection
+=head2 connection
 
   __PACKAGE__->connection($dsn, $user, $pass, $attrs);
 
@@ -63,34 +77,44 @@ sub connection {
   my ($class, @info) = @_;
   my $storage = DBIx::Class::Storage::DBI->new;
   $storage->connect_info(\@info);
-  $class->storage($storage);
+  my $schema = bless({ storage => $storage }, 'DBIx::Class::Schema');
+  $class->mk_classdata('schema_instance' => $schema);
 }
 
-=item dbi_commit
-
-  $class->dbi_commit;
+=head2 txn_begin
 
-Issues a commit again the current dbh
+Begins a transaction (does nothing if AutoCommit is off).
 
 =cut
 
-sub dbi_commit { $_[0]->storage->commit; }
+sub txn_begin { $_[0]->storage->txn_begin }
 
-=item dbi_rollback
+=head2 txn_commit
 
-  $class->dbi_rollback;
+Commits the current transaction.
 
-Issues a rollback again the current dbh
+=cut
+
+sub txn_commit { $_[0]->storage->txn_commit }
+
+=head2 txn_rollback
+
+Rolls back the current transaction.
 
 =cut
 
-sub dbi_rollback { $_[0]->storage->rollback; }
+sub txn_rollback { $_[0]->storage->txn_rollback }
 
-sub resolve_class { return shift->class_resolver->class(@_); }
+{
+  my $warn;
 
-1;
+  sub resolve_class {
+    warn "resolve_class deprecated as of 0.04999_02" unless $warn++;
+    return shift->class_resolver->class(@_);
+  }
+}
 
-=back
+1;
 
 =head1 AUTHORS