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

[ticket/12763] Remove empty schema files

Browse source 
PHPBB3-12763
This commit is contained in:
Joas Schilling 2014-06-23 21:41:04 +02:00
parent e45cd32de7
commit 3fd7fd435d
7 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/install/install_install.php
View file

@ -1153,21 +1153,25 @@ class install_install extends module
// How should we treat this schema? // How should we treat this schema?
$delimiter = $available_dbms[$data['dbms']]['DELIM']; $delimiter = $available_dbms[$data['dbms']]['DELIM'];
$sql_query = @file_get_contents($dbms_schema);
$sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
$sql_query = phpbb_remove_comments($sql_query);
$sql_query = split_sql_file($sql_query, $delimiter);
foreach ($sql_query as $sql) if (file_exists($dbms_schema))
{ {
//$sql = trim(str_replace('|', ';', $sql)); $sql_query = @file_get_contents($dbms_schema);
if (!$db->sql_query($sql)) $sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query);
$sql_query = phpbb_remove_comments($sql_query);
$sql_query = split_sql_file($sql_query, $delimiter);
foreach ($sql_query as $sql)
{ {
$error = $db->sql_error(); //$sql = trim(str_replace('|', ';', $sql));
$this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__); if (!$db->sql_query($sql))
{
$error = $db->sql_error();
$this->p_master->db_error($error['message'], $sql, __LINE__, __FILE__);
}
} }
unset($sql_query);
} }
unset($sql_query);
// Ok we have the db info go ahead and work on building the table // Ok we have the db info go ahead and work on building the table
$db_table_schema = @file_get_contents('schemas/schema.json'); $db_table_schema = @file_get_contents('schemas/schema.json');

5
phpBB/install/schemas/firebird_schema.sql
View file

@ -1,5 +0,0 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
#
# To change the contents of this file, edit
# phpBB/develop/create_schema_files.php and
# run it.

8
phpBB/install/schemas/mssql_schema.sql
View file

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

5
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -1,5 +0,0 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
#
# To change the contents of this file, edit
# phpBB/develop/create_schema_files.php and
# run it.

5
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -1,5 +0,0 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
#
# To change the contents of this file, edit
# phpBB/develop/create_schema_files.php and
# run it.

5
phpBB/install/schemas/sqlite_schema.sql
View file

@ -1,5 +0,0 @@
# DO NOT EDIT THIS FILE, IT IS GENERATED
#
# To change the contents of this file, edit
# phpBB/develop/create_schema_files.php and
# run it.

17
tests/test_framework/phpbb_database_test_connection_manager.php
View file

@ -342,14 +342,17 @@ class phpbb_database_test_connection_manager
$filename = $directory . $schema . '_schema.sql'; $filename = $directory . $schema . '_schema.sql';
$queries = file_get_contents($filename); if (file_exists($filename))
$sql = phpbb_remove_comments($queries);
$sql = split_sql_file($sql, $this->dbms['DELIM']);
foreach ($sql as $query)
{ {
$this->pdo->exec($query); $queries = file_get_contents($filename);
$sql = phpbb_remove_comments($queries);
$sql = split_sql_file($sql, $this->dbms['DELIM']);
foreach ($sql as $query)
{
$this->pdo->exec($query);
}
} }
// Ok we have the db info go ahead and work on building the table // Ok we have the db info go ahead and work on building the table