From bf18b39b6afe541e6888d32d6a555643cbe9d22e Mon Sep 17 00:00:00 2001
From: Jon Robertson <jonrober@stanford.edu>
Date: Thu, 31 Jan 2013 16:27:49 -0800
Subject: 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>
---
 perl/t/object.t | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'perl/t/object.t')

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";
-- 
cgit v1.2.3