diff options
author | Oliver Tappe | 2007-07-10 22:57:27 +0200 |
---|---|---|
committer | Oliver Tappe | 2007-07-10 22:57:27 +0200 |
commit | d5113273cf2cefd1db9942e4d743f455aa8f669a (patch) | |
tree | f51f0d84dbd40b62b12d6e30479464eba391eff3 /config-db/OpenSLX/MetaDB | |
parent | Adaptions for Ubu 7.04 and Bugfixes for older Versions (diff) | |
download | core-d5113273cf2cefd1db9942e4d743f455aa8f669a.tar.gz core-d5113273cf2cefd1db9942e4d743f455aa8f669a.tar.xz core-d5113273cf2cefd1db9942e4d743f455aa8f669a.zip |
* more work towards perlcritic compliance, fixed the low-hanging fruit
for level 4
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1234 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'config-db/OpenSLX/MetaDB')
-rw-r--r-- | config-db/OpenSLX/MetaDB/Base.pm | 4 | ||||
-rw-r--r-- | config-db/OpenSLX/MetaDB/CSV.pm | 7 | ||||
-rw-r--r-- | config-db/OpenSLX/MetaDB/DBI.pm | 11 | ||||
-rw-r--r-- | config-db/OpenSLX/MetaDB/SQLite.pm | 4 | ||||
-rw-r--r-- | config-db/OpenSLX/MetaDB/mysql.pm | 8 |
5 files changed, 29 insertions, 5 deletions
diff --git a/config-db/OpenSLX/MetaDB/Base.pm b/config-db/OpenSLX/MetaDB/Base.pm index 2aa1c3f2..3f03fbed 100644 --- a/config-db/OpenSLX/MetaDB/Base.pm +++ b/config-db/OpenSLX/MetaDB/Base.pm @@ -28,7 +28,7 @@ sub new confess "Don't create OpenSLX::MetaDB::Base - objects directly!"; } -sub connect +sub connect ## no critic (ProhibitBuiltinHomonyms) { } @@ -124,7 +124,7 @@ sub generateNextIdForTable # NB: if this method is called without a tablename, it returns: # 1 if this backend requires manual ID generation # 0 if not. - return undef; + return; } sub addVendorOS diff --git a/config-db/OpenSLX/MetaDB/CSV.pm b/config-db/OpenSLX/MetaDB/CSV.pm index ef96833a..0ef9ab93 100644 --- a/config-db/OpenSLX/MetaDB/CSV.pm +++ b/config-db/OpenSLX/MetaDB/CSV.pm @@ -38,7 +38,7 @@ sub new return bless $self, $class; } -sub connect +sub connect ## no critic (ProhibitBuiltinHomonyms) { my $self = shift; @@ -55,6 +55,7 @@ sub connect $self->{'dbh'} = DBI->connect("dbi:CSV:$dbSpec", undef, undef, {PrintError => 0}) or die _tr("Cannot connect to database '%s' (%s)", $dbSpec, $DBI::errstr); + return; } sub quote @@ -78,6 +79,7 @@ sub start_transaction $self->{"transaction-lock"} = *TRANSFILE; flock(TRANSFILE, LOCK_EX) or confess _tr(q[Can't lock transaction-file '%s' (%s)], $lockFile, $!); + return; } sub commit_transaction @@ -150,6 +152,7 @@ sub schemaDeclareTable my $dbh = $self->{'dbh'}; $dbh->{'csv_tables'}->{"$table"} = {'file' => "${table}.csv"}; + return; } sub schemaRenameTable @@ -162,6 +165,7 @@ sub schemaRenameTable $self->SUPER::schemaRenameTable($oldTable, $newTable, @_); my $dbh = $self->{'dbh'}; rename "$dbh->{'f_dir'}/id-$oldTable", "$dbh->{'f_dir'}/id-$newTable"; + return; } sub schemaDropTable @@ -172,6 +176,7 @@ sub schemaDropTable $self->SUPER::schemaDropTable($table, @_); my $dbh = $self->{'dbh'}; unlink "$dbh->{'f_dir'}/id-$table"; + return; } 1; diff --git a/config-db/OpenSLX/MetaDB/DBI.pm b/config-db/OpenSLX/MetaDB/DBI.pm index 91d774c7..470fa5c7 100644 --- a/config-db/OpenSLX/MetaDB/DBI.pm +++ b/config-db/OpenSLX/MetaDB/DBI.pm @@ -35,6 +35,7 @@ sub disconnect $self->{'dbh'}->disconnect; $self->{'dbh'} = undef; + return; } sub quote @@ -669,6 +670,7 @@ sub setSystemIDsOfClient my @currSystems = $self->fetchSystemIDsOfClient($clientID); $self->_updateRefTable('client_system_ref', $clientID, $systemIDs, 'client_id', 'system_id', \@currSystems); + return; } sub setGroupIDsOfClient @@ -680,6 +682,7 @@ sub setGroupIDsOfClient my @currGroups = $self->fetchGroupIDsOfClient($clientID); $self->_updateRefTable('group_client_ref', $clientID, $groupIDs, 'client_id', 'group_id', \@currGroups); + return; } sub addGroup @@ -716,6 +719,7 @@ sub setClientIDsOfGroup my @currClients = $self->fetchClientIDsOfGroup($groupID); $self->_updateRefTable('group_client_ref', $groupID, $clientIDs, 'group_id', 'client_id', \@currClients); + return; } sub setSystemIDsOfGroup @@ -727,6 +731,7 @@ sub setSystemIDsOfGroup my @currSystems = $self->fetchSystemIDsOfGroup($groupID); $self->_updateRefTable('group_system_ref', $groupID, $systemIDs, 'group_id', 'system_id', \@currSystems); + return; } ################################################################################ @@ -826,6 +831,7 @@ sub schemaAddTable # don't care about IDs if there's no 'id' column in this table $self->_doInsert($table, $initialVals, $ignoreIDs); } + return; } sub schemaDropTable @@ -840,6 +846,7 @@ sub schemaDropTable vlog(3, $sql); $dbh->do($sql) or confess _tr(q[Can't drop table <%s> (%s)], $table, $dbh->errstr); + return; } sub schemaRenameTable @@ -871,6 +878,7 @@ sub schemaRenameTable vlog(3, $sql); $dbh->do($sql) or confess _tr(q[Can't drop table <%s> (%s)], $oldTable, $dbh->errstr); + return; } sub schemaAddColumns @@ -912,6 +920,7 @@ sub schemaAddColumns $self->schemaDropTable($table, 1); $self->schemaRenameTable($tempTable, $table, $colDescrs, 1); + return; } sub schemaDropColumns @@ -944,6 +953,7 @@ sub schemaDropColumns $self->schemaDropTable($table, 1); $self->schemaRenameTable($tempTable, $table, $colDescrs, 1); + return; } sub schemaChangeColumns @@ -985,6 +995,7 @@ sub schemaChangeColumns $self->schemaDropTable($table, 1); $self->schemaRenameTable($tempTable, $table, $colDescrs, 1); + return; } 1; diff --git a/config-db/OpenSLX/MetaDB/SQLite.pm b/config-db/OpenSLX/MetaDB/SQLite.pm index d6681ce6..f6b395d0 100644 --- a/config-db/OpenSLX/MetaDB/SQLite.pm +++ b/config-db/OpenSLX/MetaDB/SQLite.pm @@ -35,7 +35,7 @@ sub new return bless $self, $class; } -sub connect +sub connect ## no critic (ProhibitBuiltinHomonyms) { my $self = shift; @@ -70,6 +70,7 @@ sub schemaRenameTable vlog(3, $sql); $dbh->do($sql) or croak(_tr(q[Can't rename table <%s> (%s)], $oldTable, $dbh->errstr)); + return; } sub schemaAddColumns @@ -98,6 +99,7 @@ sub schemaAddColumns if (defined $newColDefaultVals) { $self->_doUpdate($table, undef, $newColDefaultVals); } + return; } 1; diff --git a/config-db/OpenSLX/MetaDB/mysql.pm b/config-db/OpenSLX/MetaDB/mysql.pm index 769506d1..03272331 100644 --- a/config-db/OpenSLX/MetaDB/mysql.pm +++ b/config-db/OpenSLX/MetaDB/mysql.pm @@ -35,7 +35,7 @@ sub new return bless $self, $class; } -sub connect +sub connect ## no critic (ProhibitBuiltinHomonyms) { my $self = shift; @@ -49,6 +49,7 @@ sub connect $self->{'dbh'} = DBI->connect("dbi:mysql:$dbSpec", $user, '', {PrintError => 0}) or die _tr("Cannot connect to database <%s> (%s)", $dbSpec, $DBI::errstr); + return; } sub schemaConvertTypeDescrToNative @@ -85,6 +86,7 @@ sub schemaRenameTable vlog(3, $sql); $dbh->do($sql) or confess _tr(q[Can't rename table <%s> (%s)], $oldTable, $dbh->errstr); + return; } sub schemaAddColumns @@ -111,6 +113,7 @@ sub schemaAddColumns if (defined $newColDefaultVals) { $self->_doUpdate($table, undef, $newColDefaultVals); } + return; } sub schemaDropColumns @@ -132,6 +135,7 @@ sub schemaDropColumns $dbh->do($sql) or confess _tr(q[Can't drop columns from table <%s> (%s)], $table, $dbh->errstr); + return; } sub schemaChangeColumns @@ -156,5 +160,7 @@ sub schemaChangeColumns $dbh->do($sql) or confess _tr(q[Can't change columns in table <%s> (%s)], $table, $dbh->errstr); + return; } + 1; |