arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed setAttribs routine to use new delimitcol routine

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8605 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2011-01-11 15:01:40 +00:00
parent 7c1df1f1a3
commit 96d3ccfa26
1 changed files with 18 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
perl-xCAT/xCAT/Table.pm
View File

@ -1494,19 +1494,13 @@ sub setAttribs
foreach (keys %keypairs)
{
if ($xcatcfg =~ /^mysql:/) { #for mysql
$qstring .= q(`) . $_ . q(`) . " = ? AND ";
# delimit the columns of the table
my $delimitedcol = &delimitcol($_);
if ($xcatcfg =~ /^DB2:/) { # for DB2
$qstring .= $delimitedcol . " LIKE ? AND ";
} else {
if ($xcatcfg =~ /^DB2:/) { # for DB2
$qstring .= "\"$_\" LIKE ? AND ";
} else { # for Postgresql
if ($xcatcfg =~ /^Pg:/) {
$qstring .= "\"$_\" = ? AND ";
} else {
$qstring .= "$_ = ? AND ";
}
}
$qstring .= $delimitedcol . " = ? AND ";
}
push @qargs, $keypairs{$_};
@ -1564,13 +1558,10 @@ sub setAttribs
$action = "u";
for my $col (keys %$elems)
{
if (($xcatcfg =~ /^DB2:/) || ($xcatcfg =~ /^Pg:/)) {
my $colsq = q(") . $col . q("); # quote columns
$cols = $cols . $colsq . " = ?,";
} else {
$cols = $cols . $col . " = ?,";
}
push @bind, (($$elems{$col} =~ /NULL/) ? undef: $$elems{$col});
# delimit the columns of the table
my $delimitedcol = &delimitcol($col);
$cols = $cols . $delimitedcol . " = ?,";
push @bind, (($$elems{$col} =~ /NULL/) ? undef: $$elems{$col});
}
chop($cols);
my $cmd ;
@ -1580,27 +1571,14 @@ sub setAttribs
{
if (ref($keypairs{$_}))
{
if ($xcatcfg =~ /^mysql:/) { #for mysql
$cmd .= q(`) . $_ . q(`) . " = '" . $keypairs{$_}->[0] . "' AND ";
} else {
if (($xcatcfg =~ /^DB2:/) || ($xcatcfg =~ /^Pg:/)) {
$cmd .= "\"$_\"" . " = '" . $keypairs{$_}->[0] . "' AND ";
} else { # other dbs
$cmd .= "$_" . " = '" . $keypairs{$_}->[0] . "' AND ";
}
}
# delimit the columns
my $delimitedcol = &delimitcol($_);
$cmd .= $delimitedcol . " = '" . $keypairs{$_}->[0] . "' AND ";
}
else
{
if ($xcatcfg =~ /^mysql:/) { #for mysql
$cmd .= q(`) . $_ . q(`) . " = '" . $keypairs{$_} . "' AND ";
} else {
if (($xcatcfg =~ /^DB2:/) || ($xcatcfg =~ /^Pg:/)) {
$cmd .= "\"$_\"" . " = '" . $keypairs{$_} . "' AND ";
} else { # other dbs
$cmd .= "$_" . " = '" . $keypairs{$_} . "' AND ";
}
}
my $delimitedcol = &delimitcol($_);
$cmd .= $delimitedcol . " = '" . $keypairs{$_} . "' AND ";
}
}
$cmd =~ s/ AND \z//;
@ -1640,16 +1618,9 @@ sub setAttribs
}
foreach (keys %newpairs) {
if ($xcatcfg =~ /^mysql:/) { #for mysql
$cols .= q(`) . $_ . q(`) . ",";
} else {
if (($xcatcfg =~ /^DB2:/) || ($xcatcfg =~ /^Pg:/)) {
$cols .= "\"$_\"" . ",";
} else {
$cols .= $_ . ","; # for other dbs
}
}
push @bind, $newpairs{$_};
my $delimitedcol = &delimitcol($_);
$cols .= $delimitedcol . ",";
push @bind, $newpairs{$_};
}
chop($cols);
my $qstring = 'INSERT INTO ' . $self->{tabname} . " ($cols) VALUES (";