From a30984dc9602e5a7efe9556f337eb21dbcec8319 Mon Sep 17 00:00:00 2001 From: Jon Robertson Date: Thu, 31 Jan 2013 14:38:25 -0800 Subject: Fixed errors with Keytab object and its tests perl/Wallet/Object/Keytab.pm was using the wrong value for the database handle in some places (trying to load as a subroutine rather than part of the object). Also, the keytab.t tests were attempting to run against the DBIx::Class object rather than a direct dbh handle that they expected. Change-Id: Ifbb8b110d559f3ba867fc5b0dc3933fd2d4fd484 Reviewed-on: https://gerrit.stanford.edu/731 Reviewed-by: Russ Allbery Tested-by: Russ Allbery --- perl/Wallet/Object/Keytab.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'perl/Wallet') diff --git a/perl/Wallet/Object/Keytab.pm b/perl/Wallet/Object/Keytab.pm index 083dae6..b50fb6e 100644 --- a/perl/Wallet/Object/Keytab.pm +++ b/perl/Wallet/Object/Keytab.pm @@ -140,8 +140,8 @@ sub sync_set { eval { my $name = $self->{name}; my %search = (ks_name => $name); - my $sync_rs = $self->dbh->resultset('KeytabSync') - ->search (\%search); + my $sync_rs = $self->{dbh}->resultset('KeytabSync') + ->find (\%search); if (defined $sync_rs) { my $target = $sync_rs->ks_target; $sync_rs->delete; @@ -167,8 +167,8 @@ sub sync_list { eval { my %search = (ks_name => $self->{name}); my %attrs = (order_by => 'ks_target'); - my @syncs = $self->dbh->resultset('KeytabSync')->search (\%search, - \%attrs); + my @syncs = $self->{dbh}->resultset('KeytabSync')->search (\%search, + \%attrs); for my $sync_rs (@syncs) { push (@targets, $sync_rs->ks_target); } -- cgit v1.2.3