Renamed dbh subroutines and variables for clarity

In moving from DBI to DBIx::Class, we at first left the various
variables the same.  This goes through to update them for the proper
names.

* Wallet::Admin::schema was created to return the schema object (and
similarly for Wallet::Server and Wallet::Report).
* Wallet::Admin::dbh was modified to return the actual DBI handle again
(and similarly for Wallet::Server and Wallet::Report).
* Various places that used $admin->{dbh} were moved to $admin->{schema}.
* Various places using $dbh for the schema object were changed to
$schema.

Change-Id: I00914866e9a8250855a7828474aa9ce0f37b914f
Reviewed-on: https://gerrit.stanford.edu/733
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>

8 files changed, 44 insertions, 44 deletions

diff --git a/perl/t/acl.t b/perl/t/acl.t
index f169eb5..62eb411 100755
--- a/perl/t/acl.t
+++ b/perl/t/acl.t
@@ -29,30 +29,30 @@ db_setup;
 my $setup = eval { Wallet::Admin->new };
 is ($@, '', 'Database connection succeeded');
 is ($setup->reinitialize ($setup), 1, 'Database initialization succeeded');
-my $dbh = $setup->dbh;
+my $schema = $setup->schema;
 
 # Test create and new.
-my $acl = eval { Wallet::ACL->create ('test', $dbh, @trace) };
+my $acl = eval { Wallet::ACL->create ('test', $schema, @trace) };
 ok (defined ($acl), 'ACL creation');
 is ($@, '', ' with no exceptions');
 ok ($acl->isa ('Wallet::ACL'), ' and the right class');
 is ($acl->name, 'test', ' and the right name');
 is ($acl->id, 2, ' and the right ID');
-$acl = eval { Wallet::ACL->create (3, $dbh, @trace) };
+$acl = eval { Wallet::ACL->create (3, $schema, @trace) };
 ok (!defined ($acl), 'Creating with a numeric name');
 is ($@, "ACL name may not be all numbers\n", ' with the right error message');
-$acl = eval { Wallet::ACL->create ('test', $dbh, @trace) };
+$acl = eval { Wallet::ACL->create ('test', $schema, @trace) };
 ok (!defined ($acl), 'Creating a duplicate object');
 like ($@, qr/^cannot create ACL test: /, ' with the right error message');
-$acl = eval { Wallet::ACL->new ('test2', $dbh) };
+$acl = eval { Wallet::ACL->new ('test2', $schema) };
 ok (!defined ($acl), 'Searching for a non-existent ACL');
 is ($@, "ACL test2 not found\n", ' with the right error message');
-$acl = eval { Wallet::ACL->new ('test', $dbh) };
+$acl = eval { Wallet::ACL->new ('test', $schema) };
 ok (defined ($acl), 'Searching for the test ACL by name');
 is ($@, '', ' with no exceptions');
 ok ($acl->isa ('Wallet::ACL'), ' and the right class');
 is ($acl->id, 2, ' and the right ID');
-$acl = eval { Wallet::ACL->new (2, $dbh) };
+$acl = eval { Wallet::ACL->new (2, $schema) };
 ok (defined ($acl), 'Searching for the test ACL by ID');
 is ($@, '', ' with no exceptions');
 ok ($acl->isa ('Wallet::ACL'), ' and the right class');
@@ -66,15 +66,15 @@ if ($acl->rename ('example')) {
 }
 is ($acl->name, 'example', ' and the new name is right');
 is ($acl->id, 2, ' and the ID did not change');
-$acl = eval { Wallet::ACL->new ('test', $dbh) };
+$acl = eval { Wallet::ACL->new ('test', $schema) };
 ok (!defined ($acl), ' and it cannot be found under the old name');
 is ($@, "ACL test not found\n", ' with the right error message');
-$acl = eval { Wallet::ACL->new ('example', $dbh) };
+$acl = eval { Wallet::ACL->new ('example', $schema) };
 ok (defined ($acl), ' and it can be found with the new name');
 is ($@, '', ' with no exceptions');
 is ($acl->name, 'example', ' and the right name');
 is ($acl->id, 2, ' and the right ID');
-$acl = eval { Wallet::ACL->new (2, $dbh) };
+$acl = eval { Wallet::ACL->new (2, $schema) };
 ok (defined ($acl), ' and it can still found by ID');
 is ($@, '', ' with no exceptions');
 is ($acl->name, 'example', ' and the right name');
@@ -212,13 +212,13 @@ if ($acl->destroy (@trace)) {
 } else {
     is ($acl->error, '', 'Destroying the ACL works');
 }
-$acl = eval { Wallet::ACL->new ('example', $dbh) };
+$acl = eval { Wallet::ACL->new ('example', $schema) };
 ok (!defined ($acl), ' and now cannot be found');
 is ($@, "ACL example not found\n", ' with the right error message');
-$acl = eval { Wallet::ACL->new (2, $dbh) };
+$acl = eval { Wallet::ACL->new (2, $schema) };
 ok (!defined ($acl), ' or by ID');
 is ($@, "ACL 2 not found\n", ' with the right error message');
-$acl = eval { Wallet::ACL->create ('example', $dbh, @trace) };
+$acl = eval { Wallet::ACL->create ('example', $schema, @trace) };
 ok (defined ($acl), ' and creating another with the same name works');
 is ($@, '', ' with no exceptions');
 is ($acl->name, 'example', ' and the right name');
diff --git a/perl/t/admin.t b/perl/t/admin.t
index cf6a637..ff69ee9 100755
--- a/perl/t/admin.t
+++ b/perl/t/admin.t
@@ -63,11 +63,11 @@ $Wallet::Schema::VERSION = '0.07';
 is ($admin->reinitialize ('admin@EXAMPLE.COM'), 1,
     ' and re-initialization succeeds');
 $Wallet::Schema::VERSION = '0.08';
-my $schema = $admin->dbh;
+my $schema = $admin->schema;
 $schema->upgrade_directory ('sql/');
 my $retval = $admin->upgrade;
 is ($retval, 1, 'Performing an upgrade succeeds');
-my $dbh = $schema->storage->dbh;
+my $dbh = $admin->dbh;
 my $sql = "select version from dbix_class_schema_versions order by version "
     ."DESC";
 $version = $dbh->selectall_arrayref ($sql);
diff --git a/perl/t/file.t b/perl/t/file.t
index a821c4f..f902fba 100755
--- a/perl/t/file.t
+++ b/perl/t/file.t
@@ -31,7 +31,7 @@ db_setup;
 my $admin = eval { Wallet::Admin->new };
 is ($@, '', 'Database connection succeeded');
 is ($admin->reinitialize ($user), 1, 'Database initialization succeeded');
-my $dbh = $admin->dbh;
+my $schema = $admin->schema;
 
 # Use this to accumulate the history traces so that we can check history.
 my $history = '';
@@ -39,7 +39,7 @@ my $date = strftime ('%Y-%m-%d %H:%M:%S', localtime $trace[2]);
 
 # Test error handling in the absence of configuration.
 $object = eval {
-    Wallet::Object::File->create ('file', 'test', $dbh, @trace)
+    Wallet::Object::File->create ('file', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Creating a basic file object succeeds');
 ok ($object->isa ('Wallet::Object::File'), ' and is the right class');
@@ -55,7 +55,7 @@ $Wallet::Config::FILE_BUCKET = 'test-files';
 
 # Okay, now we can test.  First, the basic object without store.
 $object = eval {
-    Wallet::Object::File->create ('file', 'test', $dbh, @trace)
+    Wallet::Object::File->create ('file', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Creating a basic file object succeeds');
 ok ($object->isa ('Wallet::Object::File'), ' and is the right class');
@@ -66,7 +66,7 @@ is ($object->destroy (@trace), 1, ' but destroying the object succeeds');
 
 # Now store something and be sure that we get something reasonable.
 $object = eval {
-    Wallet::Object::File->create ('file', 'test', $dbh, @trace)
+    Wallet::Object::File->create ('file', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Recreating the object succeeds');
 is ($object->store ("foo\n", @trace), 1, ' and storing data in it succeeds');
@@ -103,7 +103,7 @@ ok (! -f 'test-files/09/test', ' and the file is gone');
 
 # Now try some aggressive names.
 $object = eval {
-    Wallet::Object::File->create ('file', '../foo', $dbh, @trace)
+    Wallet::Object::File->create ('file', '../foo', $schema, @trace)
   };
 ok (defined ($object), 'Creating ../foo succeeds');
 is ($object->store ("foo\n", @trace), 1, ' and storing data in it succeeds');
@@ -115,7 +115,7 @@ is ($object->get (@trace), "foo\n", ' and get returns correctly');
 is ($object->destroy (@trace), 1, 'Destroying the object works');
 ok (! -f 'test-files/39/%2E%2E%2Ffoo', ' and the file is gone');
 $object = eval {
-    Wallet::Object::File->create ('file', "\0", $dbh, @trace)
+    Wallet::Object::File->create ('file', "\0", $schema, @trace)
   };
 ok (defined ($object), 'Creating nul succeeds');
 is ($object->store ("foo\n", @trace), 1, ' and storing data in it succeeds');
@@ -130,7 +130,7 @@ ok (! -f 'test-files/93/%00', ' and the file is gone');
 # Test error handling in the file store.
 system ('rm -r test-files') == 0 or die "cannot remove test-files\n";
 $object = eval {
-    Wallet::Object::File->create ('file', 'test', $dbh, @trace)
+    Wallet::Object::File->create ('file', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Recreating the object succeeds');
 is ($object->store ("foo\n", @trace), undef,
diff --git a/perl/t/init.t b/perl/t/init.t
index 213aedf..aa028e3 100755
--- a/perl/t/init.t
+++ b/perl/t/init.t
@@ -24,7 +24,7 @@ is ($admin->initialize ('admin@EXAMPLE.COM'), 1,
     ' and initialization succeeds');
 
 # Check whether the database entries that should be created were.
-my $acl = eval { Wallet::ACL->new ('ADMIN', $admin->dbh) };
+my $acl = eval { Wallet::ACL->new ('ADMIN', $admin->schema) };
 is ($@, '', 'Retrieving ADMIN ACL successful');
 ok ($acl->isa ('Wallet::ACL'), ' and is the right class');
 my @entries = $acl->list;
@@ -38,7 +38,7 @@ is ($admin->reinitialize ('admin@EXAMPLE.ORG'), 1,
     'Reinitialization succeeded');
 
 # Now repeat the database content checks.
-$acl = eval { Wallet::ACL->new ('ADMIN', $admin->dbh) };
+$acl = eval { Wallet::ACL->new ('ADMIN', $admin->schema) };
 is ($@, '', 'Retrieving ADMIN ACL successful');
 ok ($acl->isa ('Wallet::ACL'), ' and is the right class');
 @entries = $acl->list;
@@ -49,7 +49,7 @@ is ($entries[0][1], 'admin@EXAMPLE.ORG', ' with the right user');
 
 # Test cleanup.
 is ($admin->destroy, 1, 'Destroying the database works');
-$acl = eval { Wallet::ACL->new ('ADMIN', $admin->dbh) };
+$acl = eval { Wallet::ACL->new ('ADMIN', $admin->schema) };
 like ($@, qr/^cannot search for ACL ADMIN: /,
       ' and now the database is gone');
 unlink 'wallet-db';
diff --git a/perl/t/keytab.t b/perl/t/keytab.t
index c263f58..561f130 100755
--- a/perl/t/keytab.t
+++ b/perl/t/keytab.t
@@ -147,8 +147,8 @@ db_setup;
 my $admin = eval { Wallet::Admin->new };
 is ($@, '', 'Database connection succeeded');
 is ($admin->reinitialize ($user), 1, 'Database initialization succeeded');
-my $schema = $admin->dbh;
-my $dbh = $schema->storage->dbh;
+my $schema = $admin->schema;
+my $dbh = $admin->dbh;
 
 # Use this to accumulate the history traces so that we can check history.
 my $history = '';
diff --git a/perl/t/object.t b/perl/t/object.t
index 2d60dd2..5eb6941 100755
--- a/perl/t/object.t
+++ b/perl/t/object.t
@@ -30,26 +30,26 @@ db_setup;
 my $admin = eval { Wallet::Admin->new };
 is ($@, '', 'Database connection succeeded');
 is ($admin->reinitialize ($user), 1, 'Database initialization succeeded');
-my $dbh = $admin->dbh;
+my $schema = $admin->schema;
 
 # Okay, now we have a database.  Test create and new.  We make believe this is
 # a keytab object; it won't matter for what we're doing.
 my $object = eval {
-    Wallet::Object::Base->create ('keytab', $princ, $dbh, @trace)
+    Wallet::Object::Base->create ('keytab', $princ, $schema, @trace)
   };
 is ($@, '', 'Object creation did not die');
 ok ($object->isa ('Wallet::Object::Base'), ' and returned the right class');
 my $other = eval {
-    Wallet::Object::Base->create ('keytab', $princ, $dbh, @trace)
+    Wallet::Object::Base->create ('keytab', $princ, $schema, @trace)
   };
 like ($@, qr/^cannot create object \Qkeytab:$princ: /, 'Repeating fails');
-$other = eval { Wallet::Object::Base->create ('', $princ, $dbh, @trace) };
+$other = eval { Wallet::Object::Base->create ('', $princ, $schema, @trace) };
 is ($@, "invalid object type\n", 'Using an empty type fails');
-$other = eval { Wallet::Object::Base->create ('keytab', '', $dbh, @trace) };
+$other = eval { Wallet::Object::Base->create ('keytab', '', $schema, @trace) };
 is ($@, "invalid object name\n", ' as does an empty name');
-$object = eval { Wallet::Object::Base->new ('keytab', "a$princ", $dbh) };
+$object = eval { Wallet::Object::Base->new ('keytab', "a$princ", $schema) };
 is ($@, "cannot find keytab:a$princ\n", 'Searching for unknown object fails');
-$object = eval { Wallet::Object::Base->new ('keytab', $princ, $dbh) };
+$object = eval { Wallet::Object::Base->new ('keytab', $princ, $schema) };
 is ($@, '', 'Object new did not die');
 ok ($object->isa ('Wallet::Object::Base'), ' and returned the right class');
 
@@ -58,7 +58,7 @@ is ($object->type, 'keytab', 'Type accessor works');
 is ($object->name, $princ, 'Name accessor works');
 
 # We'll use this for later tests.
-my $acl = Wallet::ACL->new ('ADMIN', $dbh);
+my $acl = Wallet::ACL->new ('ADMIN', $schema);
 
 # Owner.
 is ($object->owner, undef, 'Owner is not set to start');
@@ -266,12 +266,12 @@ if ($object->destroy (@trace)) {
 } else {
     is ($object->error, '', 'Destroy is successful');
 }
-$object = eval { Wallet::Object::Base->new ('keytab', $princ, $dbh) };
+$object = eval { Wallet::Object::Base->new ('keytab', $princ, $schema) };
 is ($@, "cannot find keytab:$princ\n", ' and object is all gone');
 
 # Test history.
 $object = eval {
-    Wallet::Object::Base->create ('keytab', $princ, $dbh, @trace)
+    Wallet::Object::Base->create ('keytab', $princ, $schema, @trace)
   };
 ok (defined ($object), 'Recreating the object succeeds');
 $output = <<"EOO";
diff --git a/perl/t/server.t b/perl/t/server.t
index 63f2e76..8474989 100755
--- a/perl/t/server.t
+++ b/perl/t/server.t
@@ -36,8 +36,8 @@ is ($setup->reinitialize ($admin), 1, 'Database initialization succeeded');
 $server = eval { Wallet::Server->new (@trace) };
 is ($@, '', 'Reopening with new did not die');
 ok ($server->isa ('Wallet::Server'), ' and returned the right class');
-my $dbh = $server->dbh;
-ok (defined ($dbh), ' and returns a defined database handle');
+my $schema = $server->schema;
+ok (defined ($schema), ' and returns a defined schema object');
 
 # Allow creation of base objects for testing purposes.
 $setup->register_object ('base', 'Wallet::Object::Base');
diff --git a/perl/t/wa-keyring.t b/perl/t/wa-keyring.t
index 703b7fe..3011d54 100755
--- a/perl/t/wa-keyring.t
+++ b/perl/t/wa-keyring.t
@@ -40,14 +40,14 @@ db_setup;
 my $admin = eval { Wallet::Admin->new };
 is ($@, '', 'Database connection succeeded');
 is ($admin->reinitialize ($user), 1, 'Database initialization succeeded');
-my $dbh = $admin->dbh;
+my $schema = $admin->schema;
 
 # Create a WebAuth context to use.
 my $wa = WebAuth->new;
 
 # Test error handling in the absence of configuration.
 my $object = eval {
-    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $dbh, @trace)
+    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Creating a basic WebAuth keyring object succeeds');
 ok ($object->isa ('Wallet::Object::WAKeyring'), ' and is the right class');
@@ -65,7 +65,7 @@ $Wallet::Config::WAKEYRING_BUCKET = 'test-keyrings';
 
 # Okay, now we can test.  First, the basic object without store.
 $object = eval {
-    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $dbh, @trace)
+    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Creating a basic WebAuth keyring object succeeds');
 ok ($object->isa ('Wallet::Object::WAKeyring'), ' and is the right class');
@@ -100,7 +100,7 @@ is ($object->destroy (@trace), 1, 'Destroying the object succeeds');
 
 # Now store something and be sure that we get something reasonable.
 $object = eval {
-    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $dbh, @trace)
+    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Recreating the object succeeds');
 my $key = WebAuth::Key->new ($wa, WA_KEY_AES, WA_AES_128);
@@ -159,7 +159,7 @@ is ($object->destroy (@trace), 1, 'Destroying the object succeeds');
 # Test error handling in the file store.
 system ('rm -r test-keyrings') == 0 or die "cannot remove test-keyrings\n";
 $object = eval {
-    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $dbh, @trace)
+    Wallet::Object::WAKeyring->create ('wa-keyring', 'test', $schema, @trace)
   };
 ok (defined ($object), 'Recreating the object succeeds');
 is ($object->get (@trace), undef, ' but retrieving it fails');