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

[ticket/9725] Code sniffer fixes

Browse source 
PHPBB3-9725
This commit is contained in:
Patrick Webster 2014-03-23 22:17:52 -05:00
parent aaa846cb3a
commit 79492d4110
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/db/db_tools.php
View file

@ -472,7 +472,7 @@ class phpbb_db_tools
{ {
if (!isset($table_data['PRIMARY_KEY'])) if (!isset($table_data['PRIMARY_KEY']))
{ {
$table_data['COLUMNS']['mssqlindex'] = array('UINT', NULL, 'auto_increment'); $table_data['COLUMNS']['mssqlindex'] = array('UINT', null, 'auto_increment');
$table_data['PRIMARY_KEY'] = 'mssqlindex'; $table_data['PRIMARY_KEY'] = 'mssqlindex';
} }
} }
@ -1819,7 +1819,7 @@ class phpbb_db_tools
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
// Remove default constraints // Remove default constraints
if ($row['mssql_version'][0] == '8') // SQL Server 2000 if ($row['mssql_version'][0] == '8') // SQL Server 2000
{ {
@ -1851,7 +1851,7 @@ class phpbb_db_tools
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
if ($row) if ($row)
{ {
$statements[] = 'ALTER TABLE [' . $table_name . '] DROP CONSTRAINT [' . $row['def_name'] . ']'; $statements[] = 'ALTER TABLE [' . $table_name . '] DROP CONSTRAINT [' . $row['def_name'] . ']';
@ -2348,7 +2348,7 @@ class phpbb_db_tools
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
// Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage // Using TRANSACT-SQL for this statement because we do not want to have colliding data if statements are executed at a later stage
if ($row['mssql_version'][0] == '8') // SQL Server 2000 if ($row['mssql_version'][0] == '8') // SQL Server 2000
{ {