mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/12448] Allow null as default value for columns

Browse Source 
PHPBB3-12448
This commit is contained in:
Joas Schilling
2014-06-25 13:40:32 +02:00
parent 3e9d62b9b0
commit 95ab4b3e93
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
phpBB/phpbb/db/tools.php
View File

@@ -1487,8 +1487,16 @@ class tools
$return_array['textimage'] = $column_type === '[text]';
$sql .= 'NOT NULL';
$sql_default .= 'NOT NULL';
if (!is_null($column_data[1]))
{
$sql .= 'NOT NULL';
$sql_default .= 'NOT NULL';
}
else
{
$sql .= 'NULL';
$sql_default .= 'NULL';
}
$return_array['column_type_sql_default'] = $sql_default;
@@ -1503,7 +1511,15 @@ class tools
{
$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
}
$sql .= 'NOT NULL';
if (!is_null($column_data[1]))
{
$sql .= 'NOT NULL';
}
else
{
$sql .= 'NULL';
}
if (isset($column_data[2]))
{
@@ -1528,7 +1544,7 @@ class tools
// Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields)
if (!preg_match('/number/i', $column_type))
{
$sql .= ($column_data[1] === '') ? '' : 'NOT NULL';
$sql .= ($column_data[1] === '' || $column_data[1] === null) ? '' : 'NOT NULL';
}
$return_array['auto_increment'] = false;
@@ -1588,8 +1604,11 @@ class tools
$sql .= ' ' . $column_type;
}
$sql .= ' NOT NULL ';
$sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : '';
if (!is_null($column_data[1]))
{
$sql .= ' NOT NULL ';
$sql .= "DEFAULT '{$column_data[1]}'";
}
break;
}