mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-20 07:42:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3027 from nickvergessen/ticket/13137

Browse Source 
[ticket/13137] Remove schema.json from repository

* nickvergessen/ticket/13137:
  [ticket/13137] Create schema.json in build script
  [ticket/13137] Improve output of create_schema_files.php
  [ticket/13137] Add schema.json file to .gitignore
  [ticket/13137] Generate the schema when the schema.json file is not available
  [ticket/13137] Remove schema.json file
This commit is contained in:
Andreas Fischer 2014-10-07 20:30:40 +02:00
commit 63bdd193e0
7 changed files with 69 additions and 3384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,6 +11,7 @@
/phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/*
/phpBB/images/ranks/*
/phpBB/install/schemas/schema.json
/phpBB/language/*
!/phpBB/language/en
/phpBB/store/*

3
build/build.xml
View File

@ -273,6 +273,9 @@
</else>
</if>
<!-- Create schema.json -->
<exec dir="${dir}" command="php develop/create_schema_files.php" />
<delete file="${dir}/config.php" />
<delete dir="${dir}/develop" />
<delete dir="${dir}/install/data" />

2
phpBB/develop/create_schema_files.php
View File

@ -57,4 +57,4 @@ $fp = fopen($schema_path . 'schema.json', 'wb');
fwrite($fp, json_encode($schema_data, JSON_PRETTY_PRINT));
fclose($fp);
echo 'done';
echo 'Successfully created schema file';

27
phpBB/install/install_install.php
View File

@ -1175,8 +1175,31 @@ class install_install extends module
}
// 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 = json_decode($db_table_schema, true);
if (file_exists('schemas/schema.json'))
{
$db_table_schema = @file_get_contents('schemas/schema.json');
$db_table_schema = json_decode($db_table_schema, true);
}
else
{
global $phpbb_root_path, $phpEx, $table_prefix;
$table_prefix = 'phpbb_';
if (!defined('CONFIG_TABLE'))
{
// We need to include the constants file for the table constants
// when we generate the schema from the migration files.
include($phpbb_root_path . 'includes/constants.' . $phpEx);
}
$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx);
$classes = $finder->core_path('phpbb/db/migration/data/')
->get_classes();
$sqlite_db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $sqlite_db, new \phpbb\db\tools($sqlite_db, true), $phpbb_root_path, $phpEx, $table_prefix);
$db_table_schema = $schema_generator->get_schema();
}
if (!defined('CONFIG_TABLE'))
{

3356
phpBB/install/schemas/schema.json
View File

File diff suppressed because it is too large Load Diff

45
tests/test_framework/phpbb_database_test_case.php
View File

@ -55,47 +55,46 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
static public function setUpBeforeClass()
{
$setup_extensions = static::setup_extensions();
self::$schema_file = '';
if (!empty($setup_extensions))
$schema_md5 = md5(serialize($setup_extensions));
self::$schema_file = __DIR__ . '/../tmp/' . $schema_md5 . '.json';
self::$install_schema_file = __DIR__ . '/../../phpBB/install/schemas/schema.json';
if (!file_exists(self::$schema_file))
{
$schema_md5 = md5(serialize($setup_extensions));
global $phpbb_root_path, $phpEx, $table_prefix;
$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx);
self::$schema_file = __DIR__ . '/../tmp/' . $schema_md5 . '.json';
self::$phpbb_schema_copy = __DIR__ . '/../tmp/schema_phpbb_copy.json';
self::$install_schema_file = __DIR__ . '/../../phpBB/install/schemas/schema.json';
if (!file_exists(self::$schema_file))
if (!empty($setup_extensions))
{
global $phpbb_root_path, $phpEx, $table_prefix;
$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx);
$classes = $finder->core_path('phpbb/db/migration/data/')
->set_extensions($setup_extensions)
->extension_directory('/migrations')
->get_classes();
$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_data = $schema_generator->get_schema();
}
else
{
file_put_contents(self::$schema_file, json_encode($schema_data));
$classes = $finder->core_path('phpbb/db/migration/data/')
->get_classes();
}
copy(self::$install_schema_file, self::$phpbb_schema_copy);
copy(self::$schema_file, self::$install_schema_file);
$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$schema_data = $schema_generator->get_schema();
file_put_contents(self::$schema_file, json_encode($schema_data));
}
copy(self::$schema_file, self::$install_schema_file);
parent::setUpBeforeClass();
}
static public function tearDownAfterClass()
{
if (self::$schema_file !== '')
{
copy(self::$phpbb_schema_copy, self::$install_schema_file);
unlink(self::$schema_file);
}
unlink(self::$install_schema_file);
parent::tearDownAfterClass();
}

19
tests/test_framework/phpbb_database_test_connection_manager.php
View File

@ -356,8 +356,23 @@ class phpbb_database_test_connection_manager
}
// Ok we have the db info go ahead and work on building the table
$db_table_schema = file_get_contents($directory . 'schema.json');
$db_table_schema = json_decode($db_table_schema, true);
if (file_exists($directory . 'schema.json'))
{
$db_table_schema = file_get_contents($directory . 'schema.json');
$db_table_schema = json_decode($db_table_schema, true);
}
else
{
global $phpbb_root_path, $phpEx, $table_prefix;
$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx);
$classes = $finder->core_path('phpbb/db/migration/data/')
->get_classes();
$db = new \phpbb\db\driver\sqlite();
$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
$db_table_schema = $schema_generator->get_schema();
}
$db_tools = new \phpbb\db\tools($db, true);
foreach ($db_table_schema as $table_name => $table_data)