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

interface with delimitcol routine for updateschema

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

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

@ -442,9 +442,9 @@ sub buildcreatestmt
$datatype = "VARCHAR(128) ";
}
}
# build the columns of the table
$delimitedcol= &delimitcol($col);
$retv .= $delimitedcol . " $datatype"; # mysql change
# delimit the columns of the table
$delimitedcol= &delimitcol($col);
$retv .= $delimitedcol . " $datatype"; # mysql change
if (grep /^$col$/, @{$descr->{required}})
@ -996,15 +996,9 @@ sub updateschema
{
$datatype .= " NOT NULL";
}
my $tmpcol=$dcol; # for sqlite
if (($xcatcfg =~ /^DB2:/) || ($xcatcfg =~ /^Pg:/)) {
$tmpcol="\"$dcol\"";
} else {
if ($xcatcfg =~ /^mysql:/) {
$tmpcol="\`$dcol\`";
}
}
# delimit the columns of the table
my $tmpcol= &delimitcol($dcol);
my $tablespace;
my $stmt =
"ALTER TABLE " . $self->{tabname} . " ADD $tmpcol $datatype";
@ -1082,17 +1076,13 @@ sub updateschema
}
}
my $tmpkey=$dbkey; # for sqlite
# delimit the columns
my $tmpkey= &delimitcol($dbkey);
if (($xcatcfg =~ /^DB2:/) || ($xcatcfg =~ /^Pg:/)) {
$tmpkey="\"$dbkey\"";
# get rid of NOT NULL, cannot modify with NOT NULL
my ($tmptype,$nullvalue)= split('NOT NULL',$datatype );
$datatype=$tmptype;
} else {
if ($xcatcfg =~ /^mysql:/) {
$tmpkey="\`$dbkey\`";
}
}
my $stmt;
if ($xcatcfg =~ /^DB2:/){