mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 05:18:52 +00:00
- Postgre installs now work... kinda...
git-svn-id: file:///svn/phpbb/trunk@5642 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
6c08fa7c26
commit
59ba11f18f
1 changed files with 2 additions and 2 deletions
|
@ -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
|
||||||
|
|
Loading…
Add table
Reference in a new issue