hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 05:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lonvia PR feedback

Browse Source
This commit is contained in:
marc tobias
2020-04-26 03:33:15 +02:00
parent 38c21de0ee
commit a5d0657d9b
4 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/DB.php
View File

@@ -251,7 +251,7 @@ class DB
}
/**
* Deletes a table. Returns true on success. Returns true if the table didn't exist.
* Deletes a table. Returns true if deleted or didn't exist.
*
* @param string $sTableName
*
@@ -405,29 +405,16 @@ END;
*/
public static function generateDSN($aInfo)
{
$sDSN = 'pgsql:';
if (isset($aInfo['host'])) {
$sDSN .= 'host=' . $aInfo['host'] . ';';
} elseif (isset($aInfo['hostspec'])) {
$sDSN .= 'host=' . $aInfo['hostspec'] . ';';
}
if (isset($aInfo['port'])) {
$sDSN .= 'port=' . $aInfo['port'] . ';';
}
if (isset($aInfo['dbname'])) {
$sDSN .= 'dbname=' . $aInfo['dbname'] . ';';
} elseif (isset($aInfo['database'])) {
$sDSN .= 'dbname=' . $aInfo['database'] . ';';
}
if (isset($aInfo['user'])) {
$sDSN .= 'user=' . $aInfo['user'] . ';';
} elseif (isset($aInfo['username'])) {
$sDSN .= 'user=' . $aInfo['username'] . ';';
}
if (isset($aInfo['password'])) {
$sDSN .= 'password=' . $aInfo['password'] . ';';
}
$sDSN = preg_replace('/;$/', '', $sDSN);
$sDSN = sprintf(
'pgsql:host=%s;port=%s;dbname=%s;user=%s;password=%s;',
$aInfo['host'] ?? $aInfo['hostspec'] ?? '',
$aInfo['port'] ?? '',
$aInfo['dbname'] ?? $aInfo['database'] ?? '',
$aInfo['user'] ?? '',
$aInfo['password'] ?? ''
);
$sDSN = preg_replace('/\b\w+=;/', '', $sDSN);
$sDSN = preg_replace('/;\Z/', '', $sDSN);
return $sDSN;
}