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

[feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries

Browse source 
PHPBB3-9728
This commit is contained in:
Joas Schilling 2014-05-02 11:10:03 +02:00
parent fd37f63614
commit ae3586869a
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_database.php
View file

@ -1081,7 +1081,7 @@ class sqlite3_extractor extends base_extractor
FROM sqlite_master FROM sqlite_master
WHERE type = 'table' WHERE type = 'table'
AND name = '" . $db->sql_escape($table_name) . "' AND name = '" . $db->sql_escape($table_name) . "'
ORDER BY type DESC, name;"; ORDER BY name ASC;";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);

6
phpBB/phpbb/db/tools.php
View file

@ -2755,8 +2755,7 @@ class tools
$sql = "SELECT sql $sql = "SELECT sql
FROM sqlite_master FROM sqlite_master
WHERE type = 'table' WHERE type = 'table'
AND name = '{$table_name}' AND name = '{$table_name}'";
ORDER BY type DESC, name;";
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$sql_create_table = $this->db->sql_fetchfield('sql'); $sql_create_table = $this->db->sql_fetchfield('sql');
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -2770,8 +2769,7 @@ class tools
$sql = "SELECT sql $sql = "SELECT sql
FROM sqlite_master FROM sqlite_master
WHERE type = 'index' WHERE type = 'index'
AND tbl_name = '{$table_name}' AND tbl_name = '{$table_name}'";
ORDER BY type DESC, name;";
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
while ($sql_create_index = $this->db->sql_fetchfield('sql')) while ($sql_create_index = $this->db->sql_fetchfield('sql'))
{ {