Author: hmbrand
Date: Tue Dec 14 22:57:23 2010
New Revision: 14575
Modified:
dbi/branches/sqlengine/lib/DBD/File.pm
Log:
tidy
Tested against:
# Using DBI version 1.616
# Using DBD::File version 0.40
# Using SQL::Statement version 1.32
# Using Text::CSV_XS version 0.79
# DBD::CSV 0.32 using Text::CSV_XS (0.79)
# DBD::File 0.40 using IO::File (1.14)
# DBI::DBD::SqlEngine 0.03 using SQL::Statement 1.32
# DBI 1.616
# OS linux (2.6.34.7-0.2-desktop)
# Perl 5.012002 (i686-linux-64int-ld)
All OK
Modified: dbi/branches/sqlengine/lib/DBD/File.pm
==============================================================================
--- dbi/branches/sqlengine/lib/DBD/File.pm (original)
+++ dbi/branches/sqlengine/lib/DBD/File.pm Tue Dec 14 22:57:23 2010
@@ -227,7 +227,7 @@
if (0 == $phase) {
# f_ext should not be initialized
# f_map is deprecated (but might return)
- $dbh->{f_in_gofer} = (defined ($INC{'DBD/Gofer.pm'}) and
((caller(5))[0] eq 'DBI::Gofer::Execute'));
+ $dbh->{f_in_gofer} = (defined $INC{"DBD/Gofer.pm"} && (caller(5))[0] eq
"DBI::Gofer::Execute");
$dbh->{f_dir} = Cwd::abs_path (File::Spec->curdir ());
$dbh->{f_meta} = {};
$dbh->{f_meta_map} = {}; # choose new name because it contains other
keys
@@ -272,18 +272,17 @@
sub validate_FETCH_attr
{
- my ( $dbh, $attrib ) = @_;
+ my ($dbh, $attrib) = @_;
if ($dbh->{f_in_gofer}) {
(my $drv_class = $dbh->{ImplementorClass}) =~ s/::db$//;
my $drv_prefix = DBI->driver_prefix ($drv_class);
- if (exists $dbh->{$drv_prefix . "meta"} and ($attrib eq
$dbh->{$drv_prefix . "meta"})) {
- $attrib = 'f_meta';
- }
+ exists $dbh->{$drv_prefix . "meta"} && $attrib eq $dbh->{$drv_prefix .
"meta"} and
+ $attrib = "f_meta";
}
return $attrib;
- }
+ } # validate_FETCH_attr
sub validate_STORE_attr
{
