makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10214] Correct Oracle create table query syntax in db_tools
This commit is contained in:
Andreas Fischer 2011-06-13 19:50:06 +02:00
commit 8a54aa5d68
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/db/db_tools.php
View file

@ -543,7 +543,7 @@ class phpbb_db_tools
break; break;
case 'oracle': case 'oracle':
$table_sql .= "\n);"; $table_sql .= "\n)";
$statements[] = $table_sql; $statements[] = $table_sql;
// do we need to add a sequence and a tigger for auto incrementing columns? // 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 .= "BEGIN\n";
$trigger .= "\tSELECT {$table_name}_seq.nextval\n"; $trigger .= "\tSELECT {$table_name}_seq.nextval\n";
$trigger .= "\tINTO :new.{$create_sequence}\n"; $trigger .= "\tINTO :new.{$create_sequence}\n";
$trigger .= "\tFROM dual\n"; $trigger .= "\tFROM dual;\n";
$trigger .= "END;"; $trigger .= "END;";
$statements[] = $trigger; $statements[] = $trigger;

4
phpBB/install/database_update.php
View file

@ -2710,7 +2710,7 @@ class updater_db_tools
break; break;
case 'oracle': case 'oracle':
$table_sql .= "\n);"; $table_sql .= "\n)";
$statements[] = $table_sql; $statements[] = $table_sql;
// do we need to add a sequence and a tigger for auto incrementing columns? // 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 .= "BEGIN\n";
$trigger .= "\tSELECT {$table_name}_seq.nextval\n"; $trigger .= "\tSELECT {$table_name}_seq.nextval\n";
$trigger .= "\tINTO :new.{$create_sequence}\n"; $trigger .= "\tINTO :new.{$create_sequence}\n";
$trigger .= "\tFROM dual\n"; $trigger .= "\tFROM dual;\n";
$trigger .= "END;"; $trigger .= "END;";
$statements[] = $trigger; $statements[] = $trigger;