diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 19:50:06 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-13 19:50:06 +0200 |
| commit | 8a54aa5d6832c6b30b6cc6d5a961f309d2f31ce9 (patch) | |
| tree | 78147437be833f0997f8c558d57c6d9a87764355 /phpBB | |
| parent | 5c010250ee18a8999e7b8e8139585d330138b1ed (diff) | |
| parent | 5223f7558b646628e0f040f7e25506eed8cbdfcf (diff) | |
| download | forums-8a54aa5d6832c6b30b6cc6d5a961f309d2f31ce9.tar forums-8a54aa5d6832c6b30b6cc6d5a961f309d2f31ce9.tar.gz forums-8a54aa5d6832c6b30b6cc6d5a961f309d2f31ce9.tar.bz2 forums-8a54aa5d6832c6b30b6cc6d5a961f309d2f31ce9.tar.xz forums-8a54aa5d6832c6b30b6cc6d5a961f309d2f31ce9.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10214] Correct Oracle create table query syntax in db_tools
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index cdf8ce2040..98728f7e8f 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -543,7 +543,7 @@ class phpbb_db_tools break; case 'oracle': - $table_sql .= "\n);"; + $table_sql .= "\n)"; $statements[] = $table_sql; // do we need to add a sequence and a tigger for auto incrementing columns? @@ -561,7 +561,7 @@ class phpbb_db_tools $trigger .= "BEGIN\n"; $trigger .= "\tSELECT {$table_name}_seq.nextval\n"; $trigger .= "\tINTO :new.{$create_sequence}\n"; - $trigger .= "\tFROM dual\n"; + $trigger .= "\tFROM dual;\n"; $trigger .= "END;"; $statements[] = $trigger; diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 2835e11caa..eae51b12a4 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2710,7 +2710,7 @@ class updater_db_tools break; case 'oracle': - $table_sql .= "\n);"; + $table_sql .= "\n)"; $statements[] = $table_sql; // do we need to add a sequence and a tigger for auto incrementing columns? @@ -2728,7 +2728,7 @@ class updater_db_tools $trigger .= "BEGIN\n"; $trigger .= "\tSELECT {$table_name}_seq.nextval\n"; $trigger .= "\tINTO :new.{$create_sequence}\n"; - $trigger .= "\tFROM dual\n"; + $trigger .= "\tFROM dual;\n"; $trigger .= "END;"; $statements[] = $trigger; |