Permalink
Browse files

Merge remote-tracking branch 'naderman/ticket/10214' into develop-oly…

…mpus

* naderman/ticket/10214:
  [ticket/10214] Correct Oracle create table query syntax in db_tools
  • Loading branch information...
2 parents 7cc45ee + c090e1c commit 5223f7558b646628e0f040f7e25506eed8cbdfcf @bantu bantu committed Jun 13, 2011
Showing with 4 additions and 4 deletions.
  1. +2 −2 phpBB/includes/db/db_tools.php
  2. +2 −2 phpBB/install/database_update.php
@@ -543,7 +543,7 @@ function sql_create_table($table_name, $table_data)
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 @@ function sql_create_table($table_name, $table_data)
$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;
@@ -2484,7 +2484,7 @@ function sql_create_table($table_name, $table_data)
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?
@@ -2502,7 +2502,7 @@ function sql_create_table($table_name, $table_data)
$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;

0 comments on commit 5223f75

Please sign in to comment.