diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-01-26 02:06:37 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-01-26 02:06:37 +0000 |
| commit | 870921c87231c1e637de76295914be53b846469a (patch) | |
| tree | 6686c3c358f2fae6be0792466a2735bbb8a9451a /phpBB/includes/db/db_tools.php | |
| parent | 5306a586b17d0c85d6a52dea994806bbb1891e50 (diff) | |
| download | forums-870921c87231c1e637de76295914be53b846469a.tar forums-870921c87231c1e637de76295914be53b846469a.tar.gz forums-870921c87231c1e637de76295914be53b846469a.tar.bz2 forums-870921c87231c1e637de76295914be53b846469a.tar.xz forums-870921c87231c1e637de76295914be53b846469a.zip | |
Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL <= 7.4 [Bug #54435]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10446 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/db_tools.php')
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index a762b31681..7123c83e51 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -1348,7 +1348,29 @@ class phpbb_db_tools break; case 'postgres': - $statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql']; + if (version_compare($this->db->sql_server_info(true), '8.0', '>=')) + { + $statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type_sql']; + } + else + { + // old versions cannot add columns with default and null information + $statements[] = 'ALTER TABLE ' . $table_name . ' ADD COLUMN "' . $column_name . '" ' . $column_data['column_type'] . ' ' . $column_data['constraint']; + + if (isset($column_data['null'])) + { + if ($column_data['null'] == 'NOT NULL') + { + $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET NOT NULL'; + } + } + + if (isset($column_data['default'])) + { + $statements[] = 'ALTER TABLE ' . $table_name . ' ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default']; + } + } + break; case 'sqlite': |