beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use template1 database as default (bug #3088192)

Browse source
This commit is contained in:
Jakub Vrana 2010-10-17 21:39:34 +02:00
parent 6ab272b72c
commit b835ce4ef4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adminer/drivers/pgsql.inc.php
View file

@ -22,11 +22,11 @@ if (isset($_GET["pgsql"])) {
function connect($server, $username, $password) { function connect($server, $username, $password) {
set_error_handler(array($this, '_error')); set_error_handler(array($this, '_error'));
$this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'"; $this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
$this->_link = @pg_connect($this->_string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : ""), PGSQL_CONNECT_FORCE_NEW); $this->_link = @pg_connect($this->_string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : " dbname='template1'"), PGSQL_CONNECT_FORCE_NEW);
if (!$this->_link && DB != "") { if (!$this->_link && DB != "") {
// try to connect directly with database for performance // try to connect directly with database for performance
$this->_database = false; $this->_database = false;
$this->_link = @pg_connect($this->_string, PGSQL_CONNECT_FORCE_NEW); $this->_link = @pg_connect("$this->_string dbname='template1'", PGSQL_CONNECT_FORCE_NEW);
} }
restore_error_handler(); restore_error_handler();
if ($this->_link) { if ($this->_link) {
@ -53,7 +53,7 @@ if (isset($_GET["pgsql"])) {
} }
function close() { function close() {
$this->_link = @pg_connect($this->_string); $this->_link = @pg_connect("$this->_string dbname='template1'");
} }
function query($query, $unbuffered = false) { function query($query, $unbuffered = false) {

2
changes.txt
View file

@ -2,6 +2,8 @@ Adminer 3.0.1-dev:
Send the form by Ctrl+Enter in all textareas Send the form by Ctrl+Enter in all textareas
Disable creating SQLite databases with extension other than db, sdb, sqlite Disable creating SQLite databases with extension other than db, sdb, sqlite
Catalan translation Catalan translation
MS SQL 2005 compatibility
PostgreSQL: connect if the eponymous database does not exist
Adminer 3.0.0 (released 2010-10-15): Adminer 3.0.0 (released 2010-10-15):
Drivers for MS SQL, SQLite, PostgreSQL, Oracle Drivers for MS SQL, SQLite, PostgreSQL, Oracle