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
brunoais · Jun 13, 2011 · 5223f75 · 5223f75
2 parents 7cc45ee + c090e1c
commit 5223f75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/phpBB/includes/db/db_tools.php b/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;

diff --git a/phpBB/install/database_update.php b/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;