mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 15:27:42 +02:00
Code Issues Releases Wiki Activity

- PostgreSQL can now use schemas. During install, under database name, enter databasename.schema

Browse Source 
- phpversion() to PHP_VERSION


git-svn-id: file:///svn/phpbb/trunk@7255 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2007-04-01 12:39:34 +00:00
parent 060a00a824
commit e7fcb3625e
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/includes/db/postgres.php
View File

@@ -62,9 +62,15 @@ class dbal_postgres extends dbal
}
}
$schema = '';
if ($database)
{
$this->dbname = $database;
if (strpos($database, '.') !== false)
{
list($database, $schema) = explode('.', $database);
}
$connect_string .= "dbname=$database";
}
@@ -72,7 +78,16 @@ class dbal_postgres extends dbal
$this->db_connect_id = ($this->persistency) ? @pg_pconnect($connect_string, $new_link) : @pg_connect($connect_string, $new_link);
return ($this->db_connect_id) ? $this->db_connect_id : $this->sql_error('');
if ($this->db_connect_id)
{
if ($schema !== '')
{
@pg_query($this->db_connect_id, 'SET search_path TO ' . $schema);
}
return $this->db_connect_id;
}
return $this->sql_error('');
}
/**
@@ -80,7 +95,7 @@ class dbal_postgres extends dbal
*/
function sql_server_info()
{
if (version_compare(phpversion(), '5.0.0', '>='))
if (version_compare(PHP_VERSION, '5.0.0', '>='))
{
$version = @pg_version($this->db_connect_id);
return 'PostgreSQL' . ((!empty($version)) ? ' ' . $version['client'] : '');