X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FDB.pm;h=235b6bf8ef82e27f06ee8747c4d2b0003777e2c8;hb=e50536940adf2ebaef907a0c29ae37fbd5ce95b1;hp=5d459f931c9226501f6ac3e5fee10b4e0189b10f;hpb=6298a324307439b76419d0f5db453b0d10f10517;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index 5d459f9..235b6bf 100644
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -17,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
 
@@ -37,14 +33,22 @@ 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
 
+Hidden.
+
+=begin hidden
+
 =head2 storage
 
 Sets or gets the storage backend. Defaults to L<DBIx::Class::Storage::DBI>.
 
+=end hidden
+
+=cut
+
+=begin hidden
+
 =head2 class_resolver
 
 ****DEPRECATED****
@@ -53,11 +57,15 @@ 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.
 
+=end hidden
+
 =cut
 
-__PACKAGE__->mk_classdata('class_resolver' =>
+__PACKAGE__->mk_classaccessor('class_resolver' =>
                           'DBIx::Class::ClassResolver::PassThrough');
 
+=begin hidden
+
 =head2 connection
 
   __PACKAGE__->connection($dsn, $user, $pass, $attrs);
@@ -65,6 +73,8 @@ __PACKAGE__->mk_classdata('class_resolver' =>
 Specifies the arguments that will be passed to DBI->connect(...) to
 instantiate the class dbh when required.
 
+=end hidden
+
 =cut
 
 sub connection {
@@ -73,6 +83,8 @@ sub connection {
   $class->schema_instance->connection(@info);
 }
 
+=begin hidden
+
 =head2 setup_schema_instance
 
 Creates a class method ->schema_instance which contains a DBIx::Class::Schema;
@@ -81,45 +93,63 @@ 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 {
   my $class = shift;
   my $schema = {};
   bless $schema, 'DBIx::Class::Schema';
-  $class->mk_classdata('schema_instance' => $schema);
+  $class->mk_classaccessor('schema_instance' => $schema);
 }
 
+=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(@_); }
 
+=begin hidden
+
 =head2 txn_commit
 
 Commits the current transaction.
 
+=end hidden
+
 =cut
 
 sub txn_commit { shift->schema_instance->txn_commit(@_); }
 
+=begin hidden
+
 =head2 txn_rollback
 
 Rolls back the current transaction.
 
+=end hidden
+
 =cut
 
 sub txn_rollback { shift->schema_instance->txn_rollback(@_); }
 
+=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<DBIx::Class::Schema/"txn_do"> for more details.
 
+=end hidden
+
 =cut
 
 sub txn_do { shift->schema_instance->txn_do(@_); }
@@ -133,25 +163,33 @@ sub txn_do { shift->schema_instance->txn_do(@_); }
   }
 }
 
+=begin hidden
+
 =head2 resultset_instance
 
 Returns an instance of a resultset for this class - effectively
 mapping the L<Class::DBI> connection-as-classdata paradigm into the
 native L<DBIx::Class::ResultSet> system.
 
+=end hidden
+
 =cut
 
 sub resultset_instance {
   $_[0]->result_source_instance->resultset
 }
 
+=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' => []);
+__PACKAGE__->mk_classaccessor('_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
@@ -188,8 +226,8 @@ sub result_source_instance {
 
   if ($result_class ne $class) {  # new class
     # Give this new class its own source and register it.
-    $source = $source->new({ 
-        %$source, 
+    $source = $source->new({
+        %$source,
         source_name  => $class,
         result_class => $class
     } );
@@ -199,33 +237,46 @@ sub result_source_instance {
   return $source;
 }
 
+=begin hidden
+
 =head2 resolve_class
 
 ****DEPRECATED****
 
-See L<class_resolver>
+See L</class_resolver>
+
+=end hidden
+
+=begin hidden
 
 =head2 dbi_commit
 
 ****DEPRECATED****
 
-Alias for L<txn_commit>
+Alias for L</txn_commit>
+
+=end hidden
+
+=begin hidden
 
 =head2 dbi_rollback
 
 ****DEPRECATED****
 
-Alias for L<txn_rollback>
+Alias for L</txn_rollback>
 
-=end HIDE_BECAUSE_THIS_CLASS_IS_DEPRECATED
+=end hidden
 
-=head1 AUTHORS
+=head1 FURTHER QUESTIONS?
 
-Matt S. Trout <mst@shadowcatsystems.co.uk>
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
 
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
 
-You may distribute this code under the same terms as Perl itself.
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
 
 =cut