- Postgre installs now work... kinda...

git-svn-id: file:///svn/phpbb/trunk@5642 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-03-17 05:30:44 +00:00
parent 6c08fa7c26
commit 59ba11f18f

View file

@ -14,7 +14,7 @@
if (!defined('SQL_LAYER')) if (!defined('SQL_LAYER'))
{ {
define('SQL_LAYER', 'postgresql'); define('SQL_LAYER', 'postgres');
include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); include($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
/** /**
@ -122,7 +122,7 @@ class dbal_postgres extends dbal
if (strpos($query, 'SELECT') === 0 && strpos($query, 'FROM (') !== false) if (strpos($query, 'SELECT') === 0 && strpos($query, 'FROM (') !== false)
{ {
$query = preg_replace('#FROM \((.+)\) #', 'FROM \1 ', $query); $query = preg_replace('#FROM \(([^)]+)\)\s#', 'FROM \1 ', $query);
} }
// EXPLAIN only in extra debug mode // EXPLAIN only in extra debug mode