From 95ab4b3e931521ce3c56068478311f0c04f713cc Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Jun 2014 13:40:32 +0200 Subject: [ticket/12448] Allow null as default value for columns PHPBB3-12448 --- phpBB/phpbb/db/tools.php | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'phpBB/phpbb/db/tools.php') diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 2ec46ed239..874fe4dc11 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -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; } -- cgit v1.2.1 From b2044884ffab5e32fa1870ec68fe956a7cb05e1e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Jun 2014 18:37:46 +0200 Subject: [ticket/12448] Fix null columns for postgres PHPBB3-12448 --- phpBB/phpbb/db/tools.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/phpbb/db/tools.php') diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 874fe4dc11..54075b464c 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -1572,6 +1572,12 @@ class tools $return_array['null'] = 'NOT NULL'; $sql .= 'NOT NULL '; } + else + { + $default_val = "'" . $column_data[1] . "'"; + $return_array['null'] = 'NULL'; + $sql .= 'NULL '; + } $return_array['default'] = $default_val; -- cgit v1.2.1 From 4917ebe93a7490d814848f2ce6a5c80343599dcf Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 25 Jun 2014 18:39:10 +0200 Subject: [ticket/12448] Fix null columns for MS SQL PHPBB3-12448 --- phpBB/phpbb/db/tools.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/db/tools.php') diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 54075b464c..bafd547917 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -1487,7 +1487,7 @@ class tools $return_array['textimage'] = $column_type === '[text]'; - if (!is_null($column_data[1])) + if (!is_null($column_data[1]) || (isset($column_data[2]) && $column_data[2] == 'auto_increment')) { $sql .= 'NOT NULL'; $sql_default .= 'NOT NULL'; -- cgit v1.2.1