holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for postgreSql's AddColumn, to allow to set a default and a not null contraint, they are not allowed in add column in pgSQL

Browse Source
This commit is contained in:
Ralf Becker 2003-03-18 00:07:17 +00:00
parent eb3178426a
commit 027cfe7207
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
etemplate/inc/class.schema_proc_pgsql.inc.php
View File

@ -581,10 +581,37 @@
function AddColumn($oProc, &$aTables, $sTableName, $sColumnName, &$aColumnDef) function AddColumn($oProc, &$aTables, $sTableName, $sColumnName, &$aColumnDef)
{ {
if (isset($aColumnDef['default'])) // pgsql cant add a colum with a default
{
$default = $aColumnDef['default'];
unset($aColumnDef['default']);
}
if (isset($aColumnDef['nullable']) && !$aColumnDef['nullable']) // pgsql cant add a column not nullable
{
$notnull = !$aColumnDef['nullable'];
unset($aColumnDef['nullable']);
}
$oProc->_GetFieldSQL($aColumnDef, $sFieldSQL); $oProc->_GetFieldSQL($aColumnDef, $sFieldSQL);
$query = "ALTER TABLE $sTableName ADD COLUMN $sColumnName $sFieldSQL"; $query = "ALTER TABLE $sTableName ADD COLUMN $sColumnName $sFieldSQL";
return !!($oProc->m_odb->query($query)); if (($Ok = !!($oProc->m_odb->query($query))) && isset($default))
{
$query = "ALTER TABLE $sTableName ALTER COLUMN $sColumnName SET DEFAULT '$default';\n";
$query .= "UPDATE $sTableName SET $sColumnName='$default';\n";
$Ok = !!($oProc->m_odb->query($query));
if ($OK && $notnull)
{
// unfortunally this is pgSQL >= 7.3
//$query .= "ALTER TABLE $sTableName ALTER COLUMN $sColumnName SET NOT NULL;\n";
//$Ok = !!($oProc->m_odb->query($query));
// so we do it the slow way
AlterColumn($oProc, $aTables, $sTableName, $sColumnName, $aColumnDef);
}
}
return $Ok;
} }
function GetSequenceSQL($sTableName, &$sSequenceSQL) function GetSequenceSQL($sTableName, &$sSequenceSQL)

29
phpgwapi/inc/class.schema_proc_pgsql.inc.php
View File

@ -581,10 +581,37 @@
function AddColumn($oProc, &$aTables, $sTableName, $sColumnName, &$aColumnDef) function AddColumn($oProc, &$aTables, $sTableName, $sColumnName, &$aColumnDef)
{ {
if (isset($aColumnDef['default'])) // pgsql cant add a colum with a default
{
$default = $aColumnDef['default'];
unset($aColumnDef['default']);
}
if (isset($aColumnDef['nullable']) && !$aColumnDef['nullable']) // pgsql cant add a column not nullable
{
$notnull = !$aColumnDef['nullable'];
unset($aColumnDef['nullable']);
}
$oProc->_GetFieldSQL($aColumnDef, $sFieldSQL); $oProc->_GetFieldSQL($aColumnDef, $sFieldSQL);
$query = "ALTER TABLE $sTableName ADD COLUMN $sColumnName $sFieldSQL"; $query = "ALTER TABLE $sTableName ADD COLUMN $sColumnName $sFieldSQL";
return !!($oProc->m_odb->query($query)); if (($Ok = !!($oProc->m_odb->query($query))) && isset($default))
{
$query = "ALTER TABLE $sTableName ALTER COLUMN $sColumnName SET DEFAULT '$default';\n";
$query .= "UPDATE $sTableName SET $sColumnName='$default';\n";
$Ok = !!($oProc->m_odb->query($query));
if ($OK && $notnull)
{
// unfortunally this is pgSQL >= 7.3
//$query .= "ALTER TABLE $sTableName ALTER COLUMN $sColumnName SET NOT NULL;\n";
//$Ok = !!($oProc->m_odb->query($query));
// so we do it the slow way
AlterColumn($oProc, $aTables, $sTableName, $sColumnName, $aColumnDef);
}
}
return $Ok;
} }
function GetSequenceSQL($sTableName, &$sSequenceSQL) function GetSequenceSQL($sTableName, &$sSequenceSQL)