aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/db')
-rw-r--r--phpBB/includes/db/mysql4.php5
-rw-r--r--phpBB/includes/db/mysqli.php3
-rw-r--r--phpBB/includes/db/postgres.php5
3 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php
index ce56efc664..3df2c0ad0d 100644
--- a/phpBB/includes/db/mysql4.php
+++ b/phpBB/includes/db/mysql4.php
@@ -20,7 +20,10 @@ if (!defined('SQL_LAYER'))
/**
* @package dbal
* MySQL4 Database Abstraction Layer
-* Minimum Requirement is 4.0+ (4.1+ compatible)
+* Compatible with:
+* MySQL 4.0+
+* MySQL 4.1+
+* MySQL 5.0+
*/
class dbal_mysql4 extends dbal
{
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 5bd4b124db..82ee6ecf21 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -20,7 +20,8 @@ if (!defined('SQL_LAYER'))
/**
* @package dbal
* MySQLi Database Abstraction Layer
-* Minimum Requirement is MySQL 4.1+ and the mysqli-extension
+* mysqli-extension has to be compiled with:
+* MySQL 4.1+ or MySQL 5.0+
*/
class dbal_mysqli extends dbal
{
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index 72590d6330..f371202578 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -120,6 +120,11 @@ class dbal_postgres extends dbal
{
global $cache;
+ if (strpos($query, 'SELECT') === 0 && strpos($query, 'FROM (') !== false)
+ {
+ $query = preg_replace('#FROM \((.+)\) #', 'FROM \1 ', $query);
+ }
+
// EXPLAIN only in extra debug mode
if (defined('DEBUG_EXTRA'))
{