1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00

Merge branch 'develop-olympus' into develop

This commit is contained in:
Joas Schilling 2011-10-14 04:39:20 +02:00
commit 8f6e99740b
8 changed files with 56 additions and 35 deletions

View File

@ -251,32 +251,43 @@ foreach ($supported_dbms as $dbms)
{ {
case 'mysql_40': case 'mysql_40':
case 'mysql_41': case 'mysql_41':
$line = "#\n# \$I" . "d: $\n#\n\n"; case 'firebird':
case 'sqlite':
fwrite($fp, "# DO NOT EDIT THIS FILE, IT IS GENERATED\n");
fwrite($fp, "#\n");
fwrite($fp, "# To change the contents of this file, edit\n");
fwrite($fp, "# phpBB/develop/create_schema_files.php and\n");
fwrite($fp, "# run it.\n");
break; break;
case 'mssql':
case 'oracle':
case 'postgres':
fwrite($fp, "/*\n");
fwrite($fp, " * DO NOT EDIT THIS FILE, IT IS GENERATED\n");
fwrite($fp, " *\n");
fwrite($fp, " * To change the contents of this file, edit\n");
fwrite($fp, " * phpBB/develop/create_schema_files.php and\n");
fwrite($fp, " * run it.\n");
fwrite($fp, " */\n\n");
break;
}
switch ($dbms)
{
case 'firebird': case 'firebird':
$line = "#\n# \$I" . "d: $\n#\n\n";
$line .= custom_data('firebird') . "\n"; $line .= custom_data('firebird') . "\n";
break; break;
case 'sqlite': case 'sqlite':
$line = "#\n# \$I" . "d: $\n#\n\n";
$line .= "BEGIN TRANSACTION;\n\n"; $line .= "BEGIN TRANSACTION;\n\n";
break; break;
case 'mssql':
$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
// no need to do this, no transaction support for schema changes
//$line .= "BEGIN TRANSACTION\nGO\n\n";
break;
case 'oracle': case 'oracle':
$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
$line .= custom_data('oracle') . "\n"; $line .= custom_data('oracle') . "\n";
break; break;
case 'postgres': case 'postgres':
$line = "/*\n\n \$I" . "d: $\n\n*/\n\n";
$line .= "BEGIN;\n\n"; $line .= "BEGIN;\n\n";
$line .= custom_data('postgres') . "\n"; $line .= custom_data('postgres') . "\n";
break; break;

View File

@ -1,7 +1,8 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
# #
# $Id: $ # To change the contents of this file, edit
# # phpBB/develop/create_schema_files.php and
# run it.
# Table: 'phpbb_attachments' # Table: 'phpbb_attachments'
CREATE TABLE phpbb_attachments ( CREATE TABLE phpbb_attachments (

View File

@ -1,8 +1,10 @@
/* /*
* DO NOT EDIT THIS FILE, IT IS GENERATED
$Id: $ *
* To change the contents of this file, edit
*/ * phpBB/develop/create_schema_files.php and
* run it.
*/
/* /*
Table: 'phpbb_attachments' Table: 'phpbb_attachments'

View File

@ -1,7 +1,8 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
# #
# $Id: $ # To change the contents of this file, edit
# # phpBB/develop/create_schema_files.php and
# run it.
# Table: 'phpbb_attachments' # Table: 'phpbb_attachments'
CREATE TABLE phpbb_attachments ( CREATE TABLE phpbb_attachments (
attach_id mediumint(8) UNSIGNED NOT NULL auto_increment, attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,

View File

@ -1,7 +1,8 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
# #
# $Id: $ # To change the contents of this file, edit
# # phpBB/develop/create_schema_files.php and
# run it.
# Table: 'phpbb_attachments' # Table: 'phpbb_attachments'
CREATE TABLE phpbb_attachments ( CREATE TABLE phpbb_attachments (
attach_id mediumint(8) UNSIGNED NOT NULL auto_increment, attach_id mediumint(8) UNSIGNED NOT NULL auto_increment,

View File

@ -1,8 +1,10 @@
/* /*
* DO NOT EDIT THIS FILE, IT IS GENERATED
$Id: $ *
* To change the contents of this file, edit
*/ * phpBB/develop/create_schema_files.php and
* run it.
*/
/* /*
This first section is optional, however its probably the best method This first section is optional, however its probably the best method

View File

@ -1,8 +1,10 @@
/* /*
* DO NOT EDIT THIS FILE, IT IS GENERATED
$Id: $ *
* To change the contents of this file, edit
*/ * phpBB/develop/create_schema_files.php and
* run it.
*/
BEGIN; BEGIN;

View File

@ -1,7 +1,8 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
# #
# $Id: $ # To change the contents of this file, edit
# # phpBB/develop/create_schema_files.php and
# run it.
BEGIN TRANSACTION; BEGIN TRANSACTION;
# Table: 'phpbb_attachments' # Table: 'phpbb_attachments'