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

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10352] Add missing break for Oracle's sql_table_drop()
  [ticket/10351] Fix Oracle's sql_column_remove()
  [ticket/10294] Fix sql_affectedrows() in mssqlnative driver.
This commit is contained in:
Andreas Fischer 2011-09-06 00:44:19 +02:00
commit b21cee731a
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1805,7 +1805,7 @@ class phpbb_db_tools
break; break;
case 'oracle': case 'oracle':
$statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name; $statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name;
break; break;
case 'postgres': case 'postgres':
@ -1956,6 +1956,7 @@ class phpbb_db_tools
$statements[] = "DROP SEQUENCE {$row['referenced_name']}"; $statements[] = "DROP SEQUENCE {$row['referenced_name']}";
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
break;
case 'postgres': case 'postgres':
// PGSQL does not "tightly" bind sequences and tables, we must guess... // PGSQL does not "tightly" bind sequences and tables, we must guess...

2
phpBB/includes/db/mssqlnative.php
View file

@ -396,7 +396,7 @@ class dbal_mssqlnative extends dbal
*/ */
function sql_affectedrows() function sql_affectedrows()
{ {
return ($this->db_connect_id) ? @sqlsrv_rows_affected($this->db_connect_id) : false; return (!empty($this->query_result)) ? @sqlsrv_rows_affected($this->query_result) : false;
} }
/** /**