diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-04-18 02:41:59 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-04-18 02:41:59 +0000 |
| commit | 03b9af1f28c0d537d8459c9820e0f49464046e33 (patch) | |
| tree | abca94200c0c3855acda96f197363940a4835b2e /phpBB/includes/db/mssql.php | |
| parent | 5b3d732456c281e4beaeb2f4aeb819a535e6d1be (diff) | |
| download | forums-03b9af1f28c0d537d8459c9820e0f49464046e33.tar forums-03b9af1f28c0d537d8459c9820e0f49464046e33.tar.gz forums-03b9af1f28c0d537d8459c9820e0f49464046e33.tar.bz2 forums-03b9af1f28c0d537d8459c9820e0f49464046e33.tar.xz forums-03b9af1f28c0d537d8459c9820e0f49464046e33.zip | |
- Olympus now properly works with MS SQL
- DB backup system handles MS SQL
- A few bug fixes to the backup system ;)
git-svn-id: file:///svn/phpbb/trunk@5793 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/mssql.php')
| -rw-r--r-- | phpBB/includes/db/mssql.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index 0e30a2670a..dde20bed8f 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -98,6 +98,8 @@ class dbal_mssql extends dbal { global $cache; + $query = preg_replace('#FROM \(([^)]*)\)(,|[\n\r\t ]+(?:WHERE|LEFT JOIN)) #', 'FROM \1\2 ', $query); + // EXPLAIN only in extra debug mode if (defined('DEBUG_EXTRA')) { @@ -109,7 +111,6 @@ class dbal_mssql extends dbal if (!$this->query_result) { $this->num_queries++; - if (($this->query_result = @mssql_query($query, $this->db_connect_id)) === false) { $this->sql_error($query); @@ -318,7 +319,7 @@ class dbal_mssql extends dbal { return array( 'message' => @mssql_get_last_message($this->db_connect_id), - 'code' => '' + 'code' => @mssql_query("SELECT @@ERROR", $this->db_connect_id) ); } |