aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/db_tools.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-06-13 06:14:59 +0200
committerNils Adermann <naderman@naderman.de>2011-06-13 06:14:59 +0200
commitc090e1c9e9fc2e435a4ae2f63923955d66dccd6d (patch)
tree0e6ff23aa7f9a41aabb2fe00e651aca314f4038a /phpBB/includes/db/db_tools.php
parent7cc45ee0d5606ddd9143a8a80b6974d027916a89 (diff)
downloadforums-c090e1c9e9fc2e435a4ae2f63923955d66dccd6d.tar
forums-c090e1c9e9fc2e435a4ae2f63923955d66dccd6d.tar.gz
forums-c090e1c9e9fc2e435a4ae2f63923955d66dccd6d.tar.bz2
forums-c090e1c9e9fc2e435a4ae2f63923955d66dccd6d.tar.xz
forums-c090e1c9e9fc2e435a4ae2f63923955d66dccd6d.zip
[ticket/10214] Correct Oracle create table query syntax in db_tools
Removes the semicolon at end of oracle CREATE TABLE queries and adds a semicolon to the end of a SELECT query inside of the trigger for a new table's auto increment column before the end keyword PHPBB3-10214
Diffstat (limited to 'phpBB/includes/db/db_tools.php')
-rw-r--r--phpBB/includes/db/db_tools.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index c1af2782f8..50e308dea2 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;