[adminer-svn] SF.net SVN: adminer:[1411] branches/sqlite
Database management in a single PHP file
Brought to you by:
jakubvrana
From: <jak...@us...> - 2010-04-10 21:43:29
|
Revision: 1411 http://adminer.svn.sourceforge.net/adminer/?rev=1411&view=rev Author: jakubvrana Date: 2010-04-10 21:43:23 +0000 (Sat, 10 Apr 2010) Log Message: ----------- PDO_PgSQL Modified Paths: -------------- branches/sqlite/adminer/drivers/mysql.inc.php branches/sqlite/adminer/drivers/pgsql.inc.php branches/sqlite/adminer/include/pdo.inc.php branches/sqlite/todo.txt Modified: branches/sqlite/adminer/drivers/mysql.inc.php =================================================================== --- branches/sqlite/adminer/drivers/mysql.inc.php 2010-04-10 20:34:08 UTC (rev 1410) +++ branches/sqlite/adminer/drivers/mysql.inc.php 2010-04-10 21:43:23 UTC (rev 1411) @@ -201,6 +201,11 @@ return true; } + function select_db($database) { + // database selection is separated from the connection so dbname in DSN can't be used + return $this->query("USE " . idf_escape($database)); + } + function query($query, $unbuffered = false) { $this->setAttribute(1000, !$unbuffered); // 1000 - PDO::MYSQL_ATTR_USE_BUFFERED_QUERY return parent::query($query, $unbuffered); Modified: branches/sqlite/adminer/drivers/pgsql.inc.php =================================================================== --- branches/sqlite/adminer/drivers/pgsql.inc.php 2010-04-10 20:34:08 UTC (rev 1410) +++ branches/sqlite/adminer/drivers/pgsql.inc.php 2010-04-10 21:43:23 UTC (rev 1411) @@ -122,9 +122,15 @@ var $extension = "PDO_PgSQL"; function connect($server, $username, $password) { - $this->dsn("pgsql:host=" . str_replace(":", " port=", $server), $username, $password); + $string = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' options='-c client_encoding=utf8'"; + $this->dsn($string . (DB != "" ? " dbname='" . addcslashes(DB, "'\\") . "'" : ""), $username, $password); + //! connect without DB in case of an error return true; } + + function select_db($database) { + return (DB == $database); + } } } Modified: branches/sqlite/adminer/include/pdo.inc.php =================================================================== --- branches/sqlite/adminer/include/pdo.inc.php 2010-04-10 20:34:08 UTC (rev 1410) +++ branches/sqlite/adminer/include/pdo.inc.php 2010-04-10 21:43:23 UTC (rev 1411) @@ -1,7 +1,7 @@ <?php // PDO can be used in several database drivers if (extension_loaded('pdo')) { - class Min_PDO extends PDO { + /*abstract */class Min_PDO extends PDO { var $_result, $server_info, $affected_rows, $error; function __construct() { @@ -15,10 +15,7 @@ $this->server_info = $this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION } - function select_db($database) { - // database selection is separated from the connection so dbname in DSN can't be used - return $this->query("USE " . idf_escape($database)); - } + /*abstract function select_db($database);*/ function query($query, $unbuffered = false) { $result = parent::query($query); Modified: branches/sqlite/todo.txt =================================================================== --- branches/sqlite/todo.txt 2010-04-10 20:34:08 UTC (rev 1410) +++ branches/sqlite/todo.txt 2010-04-10 21:43:23 UTC (rev 1411) @@ -36,6 +36,7 @@ Export PostgreSQL: +Operators Users - SELECT * FROM pg_user Table schema Export - http://www.postgresql.org/docs/8.4/static/functions-info.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |