Use Piwik_Query() for consistency. Override listTables() for Pgsql.

git-svn-id: http://dev.piwik.org/svn/trunk@1487 59fd770c-687e-43c8-a1e3-f5a4ff64c105

config/config.ini.sample.php

@@ -5,14 +5,14 @@
 ; the config.ini.php file contains information about the super user and the database access
 
 [superuser]
-login			= yourSuLogin
-password		= yourSuPassword
-email			= hello@piwik.org
+login			= yourSuperUserLogin
+password		= yourSuperUserPassword
+email			= hello@example.org
 
 [database]
 host			= localhost
 username		= databaseLogin
 password		= datatabasePassword
 dbname			= databaseName
-adapter			= PDO_MYSQL ; PDO_MYSQL or MYSQLI
+adapter			= PDO_MYSQL ; PDO_MYSQL, MYSQLI, or PDO_PGSQL
 tables_prefix	= piwik_

config/global.ini.php

@@ -18,7 +18,7 @@ password		=
 dbname			= 
 tables_prefix	= 
 port			= 3306
-adapter			= PDO_MYSQL ; PDO_MYSQL or MYSQLI
+adapter			= PDO_MYSQL
 
 [database_tests]
 host 			= localhost

core/Db/Pdo/Pgsql.php

@@ -158,4 +158,26 @@ class Piwik_Db_Pdo_Pgsql extends Zend_Db_Adapter_Pdo_Pgsql implements Piwik_Db_i
 		$charset = $this->fetchOne('SHOW client_encoding');
 		return strtolower($charset) === 'utf8';
 	}
+
+	/**
+	 * Returns a list of the tables in the database.
+	 *
+	 * Replaces parent::listTables() which uses subqueries.
+	 * @see ZF-????
+	 *
+	 * @return array
+	 */
+	public function listTables()
+	{
+		$sql = "SELECT c.relname  AS table_name "
+			. "FROM pg_catalog.pg_class c "
+			. "JOIN pg_catalog.pg_roles r ON r.oid = c.relowner "
+			. "LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
+			. "WHERE n.nspname <> 'pg_catalog' "
+			. "AND n.nspname !~ '^pg_toast' "
+			. "AND pg_catalog.pg_table_is_visible(c.oid) "
+			. "AND c.relkind = 'r' ";
+ 
+         return $this->fetchCol($sql);
+	}
 }

plugins/Goals/API.php

@@ -126,7 +126,7 @@ class Piwik_Goals_API
 										WHERE idsite = ? 
 											AND idgoal = ?",
 									array($idSite, $idGoal));
-		Zend_Registry::get('db')->query("DELETE FROM ".Piwik::prefixTable("log_conversion")." WHERE idgoal = ?", $idGoal);
+		Piwik_Query("DELETE FROM ".Piwik::prefixTable("log_conversion")." WHERE idgoal = ?", $idGoal);
 		Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
 	}