diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-09-06 00:44:19 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-09-06 00:44:19 +0200 |
| commit | b21cee731af7571bd138d28ee377ff8d2c02d1ef (patch) | |
| tree | 5aa665688406c2074d556e2ebfc86509f19859e2 | |
| parent | 145bc230440f3a1a8d3252cfbfb767678d085320 (diff) | |
| parent | 92373e6d465c6dece6aca121eab67ec7b08d98d8 (diff) | |
| download | forums-b21cee731af7571bd138d28ee377ff8d2c02d1ef.tar forums-b21cee731af7571bd138d28ee377ff8d2c02d1ef.tar.gz forums-b21cee731af7571bd138d28ee377ff8d2c02d1ef.tar.bz2 forums-b21cee731af7571bd138d28ee377ff8d2c02d1ef.tar.xz forums-b21cee731af7571bd138d28ee377ff8d2c02d1ef.zip | |
Merge branch 'develop-olympus' into develop
* 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.
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 3 | ||||
| -rw-r--r-- | phpBB/includes/db/mssqlnative.php | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index f1947ab0d3..7715d2e854 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -1805,7 +1805,7 @@ class phpbb_db_tools break; case 'oracle': - $statements[] = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name; + $statements[] = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name; break; case 'postgres': @@ -1956,6 +1956,7 @@ class phpbb_db_tools $statements[] = "DROP SEQUENCE {$row['referenced_name']}"; } $this->db->sql_freeresult($result); + break; case 'postgres': // PGSQL does not "tightly" bind sequences and tables, we must guess... diff --git a/phpBB/includes/db/mssqlnative.php b/phpBB/includes/db/mssqlnative.php index 2287bc716e..96b4c8a8c8 100644 --- a/phpBB/includes/db/mssqlnative.php +++ b/phpBB/includes/db/mssqlnative.php @@ -396,7 +396,7 @@ class dbal_mssqlnative extends dbal */ 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; } /** |