Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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...
commit 5223f7558b646628e0f040f7e25506eed8cbdfcf 2 parents 7cc45ee + c090e1c
@bantu bantu authored
View
4 phpBB/includes/db/db_tools.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;
View
4 phpBB/install/database_update.php
@@ -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;
Please sign in to comment.
Something went wrong with that request. Please try again.