fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-03 16:51:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1550 mark counter_site_status table as deleted

Browse source
This commit is contained in:
Kijin Sung 2021-01-08 23:54:50 +09:00
parent 34280af0f0
commit c26325efee
5 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/db.php
View file

@ -686,6 +686,10 @@ class DB
{
return $this->setError(-1, 'Table creation failed.');
}
if ($table->deleted)
{
return new \BaseObject;
}
// Generate the CREATE TABLE query and execute it.
$query_string = $table->getCreateQuery($this->_prefix, $this->_charset, $this->_engine);

1
common/framework/parsers/dbtable/table.php
View file

@ -12,6 +12,7 @@ class Table
public $indexes = array();
public $primary_key = array();
public $constraints = array();
public $deleted = false;
/**
* Generate the CREATE TABLE query for this table.

6
common/framework/parsers/dbtableparser.php
View file

@ -61,6 +61,12 @@ class DBTableParser extends BaseParser
$table->name = strval($xml['name']);
}
$deleted = strval($xml['deleted']);
if ($deleted !== '')
{
$table->deleted = toBool($deleted);
}
// Load columns.
foreach ($xml->column as $column_info)
{

1
modules/counter/schemas/counter_site_status.xml Normal file
View file

@ -0,0 +1 @@
<table name="counter_site_status" deleted="true"></table>

21
modules/module/module.model.php
View file

@ -1442,14 +1442,25 @@ class moduleModel extends module
if(!is_dir(FileHandler::getRealPath($path))) continue;
// Get the number of xml files to create a table in schemas
$tmp_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/');
$table_count = count($tmp_files);
$table_count = 0;
$schema_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/');
foreach ($schema_files as $filename)
{
if (!preg_match('/<table\s[^>]*deleted="true"/i', file_get_contents($path . 'schemas/' . $filename)))
{
$table_count++;
}
}
// Check if the table is created
$created_table_count = 0;
for($j=0;$j<$table_count;$j++)
foreach ($schema_files as $filename)
{
list($table_name) = explode('.',$tmp_files[$j]);
if($oDB->isTableExists($table_name)) $created_table_count ++;
list($table_name, $unused) = explode('.', $filename);
if($oDB->isTableExists($table_name))
{
$created_table_count++;
}
}
// Get information of the module
$info = NULL;