X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=c97a708726871fe306f7b969950d8855ef3bcc72;hb=39e54ad026643adc23699f2e187c0e71ec4b6532;hp=3166c98b574009be69106866b9c79cd88c2f87f3;hpb=8452e496adea0c57b81f413e11b2f5b5b6e62c5c;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index 3166c98..c97a708 100644
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -6,7 +6,7 @@ use DBIx::Class::Storage::DBI;
 use DBIx::Class::ClassResolver::PassThrough;
 use DBI;
 
-__PACKAGE__->load_components(qw/ResultSetInstance/);
+__PACKAGE__->load_components(qw/ResultSetProxy/);
 
 *dbi_commit = \&txn_commit;
 *dbi_rollback = \&txn_rollback;
@@ -15,7 +15,7 @@ sub storage { shift->schema_instance(@_)->storage; }
 
 sub resultset_instance {
   my $class = shift;
-  my $source = $class->result_source;
+  my $source = $class->result_source_instance;
   if ($source->result_class ne $class) {
     $source = $source->new($source);
     $source->result_class($class);
@@ -25,7 +25,7 @@ sub resultset_instance {
 
 =head1 NAME 
 
-DBIx::Class::DB - Simple DBIx::Class Database connection by class inheritance
+DBIx::Class::DB - Non-recommended classdata schema component
 
 =head1 SYNOPSIS
 
@@ -45,7 +45,10 @@ DBIx::Class::DB - Simple DBIx::Class Database connection by class inheritance
 
 =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
 
@@ -75,9 +78,23 @@ instantiate the class dbh when required.
 
 sub connection {
   my ($class, @info) = @_;
-  my $storage = DBIx::Class::Storage::DBI->new;
-  $storage->connect_info(\@info);
-  my $schema = bless({ storage => $storage }, 'DBIx::Class::Schema');
+  $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);
 }