diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-05-05 22:06:17 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-05-05 22:06:17 +0000 |
| commit | 3d2a45ab049606701172c11552aa0c1006d2fbf1 (patch) | |
| tree | ea65a291ac3901d723f33446c54e449e3218ea13 /phpBB/includes/db/firebird.php | |
| parent | b6ffae82b938eb3c40395234f14d79b53ba003c4 (diff) | |
| download | forums-3d2a45ab049606701172c11552aa0c1006d2fbf1.tar forums-3d2a45ab049606701172c11552aa0c1006d2fbf1.tar.gz forums-3d2a45ab049606701172c11552aa0c1006d2fbf1.tar.bz2 forums-3d2a45ab049606701172c11552aa0c1006d2fbf1.tar.xz forums-3d2a45ab049606701172c11552aa0c1006d2fbf1.zip | |
I hope nothing broke!
- Added a query builder, it is currently only used for complex queries that involve a FROM clause with two tables and a left join
- Changed some function calls in the DBAL
- Made the viewtopic queries nicer
git-svn-id: file:///svn/phpbb/trunk@5885 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/firebird.php')
| -rw-r--r-- | phpBB/includes/db/firebird.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php index c94fd00882..e4eca60772 100644 --- a/phpBB/includes/db/firebird.php +++ b/phpBB/includes/db/firebird.php @@ -56,6 +56,7 @@ class dbal_firebird extends dbal switch ($status) { case 'begin': + $result = true; $this->transaction = true; break; @@ -90,7 +91,6 @@ class dbal_firebird extends dbal { global $cache; - $query = preg_replace('#FROM \(([^)]*)\)(,|[\n\r\t ]+(?:WHERE|LEFT JOIN)) #', 'FROM \1\2 ', $query); $this->last_query_text = $query; $this->query_result = ($cache_ttl && method_exists($cache, 'sql_load')) ? $cache->sql_load($query) : false; @@ -320,6 +320,15 @@ class dbal_firebird extends dbal } /** + * Build db-specific query data + * @private + */ + function _sql_custom_build($stage, $data) + { + return $data; + } + + /** * return sql error array * @private */ @@ -360,7 +369,7 @@ class dbal_firebird extends dbal { // Take the time spent on parsing rows into account } - @ibase_freeresult($result); + @ibase_free_result($result); $splittime = explode(' ', microtime()); $splittime = $splittime[0] + $splittime[1]; |