_get_dbh removed

diff --git a/lib/DBIx/Class/DB.pm b/lib/DBIx/Class/DB.pm
index b4f8beb..c9b3971 100644 (file)
--- a/lib/DBIx/Class/DB.pm
+++ b/lib/DBIx/Class/DB.pm
@@ -70,8 +70,6 @@ Issues a rollback again the current dbh
 
 sub dbi_rollback { $_[0]->storage->rollback; }
 
-sub _get_dbh { shift->storage->dbh; }
-
 1;
 
 =back

diff --git a/lib/DBIx/Class/PK/Auto/SQLite.pm b/lib/DBIx/Class/PK/Auto/SQLite.pm
index 5ddd2c0..a86bf89 100644 (file)
--- a/lib/DBIx/Class/PK/Auto/SQLite.pm
+++ b/lib/DBIx/Class/PK/Auto/SQLite.pm
@@ -8,7 +8,7 @@ use base qw/DBIx::Class/;
 __PACKAGE__->load_components(qw/PK::Auto/);
 
 sub last_insert_id {
-  return $_[0]->_get_dbh->func('last_insert_rowid');
+  return $_[0]->storage->dbh->func('last_insert_rowid');
 }
 
 1;

diff --git a/t/04db.t b/t/04db.t
index 2d97f94..98a2a89 100644 (file)
--- a/t/04db.t
+++ b/t/04db.t
@@ -7,8 +7,8 @@ use lib qw(t/lib);
 use_ok('DBICTest');
 
 # add some rows inside a transaction and commit it
-# XXX: Is _get_dbh the only way to get a dbh?
-DBICTest::Artist->_get_dbh->{AutoCommit} = 0;
+# XXX: Is storage->dbh the only way to get a dbh?
+DBICTest::Artist->storage->dbh->{AutoCommit} = 0;
 for (10..15) {
     DBICTest::Artist->create( { 
         artistid => $_,
@@ -20,19 +20,19 @@ my ($artist) = DBICTest::Artist->retrieve(15);
 is($artist->name, 'artist number 15', "Commit ok");
 
 # repeat the test using AutoCommit = 1 to force the commit
-DBICTest::Artist->_get_dbh->{AutoCommit} = 0;
+DBICTest::Artist->storage->dbh->{AutoCommit} = 0;
 for (16..20) {
     DBICTest::Artist->create( {
         artistid => $_,
         name => "artist number $_",
     } );
 }
-DBICTest::Artist->_get_dbh->{AutoCommit} = 1;
+DBICTest::Artist->storage->dbh->{AutoCommit} = 1;
 ($artist) = DBICTest::Artist->retrieve(20);
 is($artist->name, 'artist number 20', "Commit using AutoCommit ok");
 
 # add some rows inside a transaction and roll it back
-DBICTest::Artist->_get_dbh->{AutoCommit} = 0;
+DBICTest::Artist->storage->dbh->{AutoCommit} = 0;
 for (21..30) {
     DBICTest::Artist->create( {
         artistid => $_,

diff --git a/t/lib/DBICTest.pm b/t/lib/DBICTest.pm
index 75dc99c..559556f 100755 (executable)
--- a/t/lib/DBICTest.pm
+++ b/t/lib/DBICTest.pm
@@ -13,7 +13,7 @@ mkdir("t/var") unless -d "t/var";
 
 __PACKAGE__->connection("dbi:SQLite:${db_file}");
 
-my $dbh = __PACKAGE__->_get_dbh;
+my $dbh = __PACKAGE__->storage->dbh;
 
 my $sql = <<EOSQL;
 CREATE TABLE artist (artistid INTEGER NOT NULL PRIMARY KEY, name VARCHAR);