Permalink
Browse files

Use template1 database as default (bug #3088192)

  • Loading branch information...
1 parent 6ab272b commit b835ce4ef401e28dd88a772a3930152ab3e8b42a @vrana committed Oct 17, 2010
Showing with 5 additions and 3 deletions.
  1. +3 −3 adminer/drivers/pgsql.inc.php
  2. +2 −0 changes.txt
@@ -22,11 +22,11 @@ function _error($errno, $error) {
function connect($server, $username, $password) {
set_error_handler(array($this, '_error'));
$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 != "") {
// try to connect directly with database for performance
$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();
if ($this->_link) {
@@ -53,7 +53,7 @@ function select_db($database) {
}
function close() {
- $this->_link = @pg_connect($this->_string);
+ $this->_link = @pg_connect("$this->_string dbname='template1'");
}
function query($query, $unbuffered = false) {
View
@@ -2,6 +2,8 @@ Adminer 3.0.1-dev:
Send the form by Ctrl+Enter in all textareas
Disable creating SQLite databases with extension other than db, sdb, sqlite
Catalan translation
+MS SQL 2005 compatibility
+PostgreSQL: connect if the eponymous database does not exist
Adminer 3.0.0 (released 2010-10-15):
Drivers for MS SQL, SQLite, PostgreSQL, Oracle

0 comments on commit b835ce4

Please sign in to comment.