tonyair/silverstripe-postgresql
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-postgresql synced 2024-10-22 17:05:45 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Fixed border case where pg_version() could return false and break functionality in PostgreSQLDatabaseConfigurationHelper::requireDatabaseVersion()

Browse Source
This commit is contained in:
Sean Harvey 2010-05-15 04:06:15 +00:00
parent 5f17db6599
commit 2c38c37bb2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/PostgreSQLDatabaseConfigurationHelper.php
View File

@ -88,7 +88,6 @@ class PostgreSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelp
public function requireDatabaseVersion($databaseConfig) {
$success = false;
$error = '';
$version = 0;
$username = $databaseConfig['username'] ? $databaseConfig['username'] : '';
$password = $databaseConfig['password'] ? $databaseConfig['password'] : '';
@ -97,9 +96,8 @@ class PostgreSQLDatabaseConfigurationHelper implements DatabaseConfigurationHelp
$passwordPart = $password ? " password=$password" : '';
$connstring = "host=$server port=5432 dbname=postgres {$userPart}{$passwordPart}";
$conn = @pg_connect($connstring);
$versionInfo = pg_version($conn);
$version = isset($versionInfo['server']) ? $versionInfo['server'] : null;
$info = @pg_version($conn);
$version = ($info && isset($info['server'])) ? $info['server'] : null;
if(!$version) {
// fallback to using the version() function
$result = @pg_query($conn, "SELECT version()");