Moving towards instance-based schemas

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / DB.pm

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index 469d051..6aaab51 100644 (file)
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -5,8 +5,28 @@ use DBIx::Class::Storage::DBI;
 use DBIx::Class::ClassResolver::PassThrough;
 use DBI;
 
-*dbi_commit = \&tx_commit;
-*dbi_rollback = \&tx_rollback;
+__PACKAGE__->load_components(qw/ResultSetInstance/);
+
+*dbi_commit = \&txn_commit;
+*dbi_rollback = \&txn_rollback;
+
+sub storage { shift->storage_instance(@_); }
+
+sub resultset_instance {
+  my $class = shift;
+  my $table = $class->table_instance->new($class->table_instance);
+  $table->schema($class);
+  $table->result_class($class);
+  return $table->resultset;
+}
+
+sub result_source {
+  my $class = shift;
+  my $table = $class->table_instance->new($class->table_instance);
+  $table->schema($class);
+  $table->result_class($class);
+  return $table;
+}
 
 =head1 NAME 
 
@@ -46,7 +66,6 @@ it. See resolve_class below.
 
 =cut
 
-__PACKAGE__->mk_classdata('storage');
 __PACKAGE__->mk_classdata('class_resolver' =>
                             'DBIx::Class::ClassResolver::PassThrough');
 
@@ -63,32 +82,32 @@ sub connection {
   my ($class, @info) = @_;
   my $storage = DBIx::Class::Storage::DBI->new;
   $storage->connect_info(\@info);
-  $class->storage($storage);
+  $class->mk_classdata('storage_instance' => $storage);
 }
 
-=head2 tx_begin
+=head2 txn_begin
 
 Begins a transaction (does nothing if AutoCommit is off).
 
 =cut
 
-sub tx_begin { $_[0]->storage->tx_begin }
+sub txn_begin { $_[0]->storage->txn_begin }
 
-=head2 tx_commit
+=head2 txn_commit
 
 Commits the current transaction.
 
 =cut
 
-sub tx_commit { $_[0]->storage->tx_commit }
+sub txn_commit { $_[0]->storage->txn_commit }
 
-=head2 tx_rollback
+=head2 txn_rollback
 
 Rolls back the current transaction.
 
 =cut
 
-sub tx_rollback { $_[0]->storage->tx_rollback }
+sub txn_rollback { $_[0]->storage->txn_rollback }
 
 sub resolve_class { return shift->class_resolver->class(@_); }