PostgreSQL: Fix current schema in view definition

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 8abcaba7b82280ed2a0053b72eeb8da80d1d8f42..409f64a005b0c00018b4ed84977ad908ea645bf2 100644 (file)
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -455,7 +455,7 @@ ORDER BY connamespace, conname") as $row) {
 
        function view($name) {
                global $connection;
-               return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . $connection->result("SELECT oid FROM pg_class WHERE relname = " . q($name)) . ")")));
+               return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . $connection->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($name)) . ")")));
        }
 
        function collations() {

diff --git a/changes.txt b/changes.txt
index ec16cd748050fa34b5ae61e813d538a50eed3e0c..9502f6dc612c8c8fb83e85dd0c52d3b0a1eb8228 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -3,6 +3,7 @@ Elasticsearch, ClickHouse: Do not print response if HTTP code is not 200
 MySQL: Do not export names in quotes with sql_mode='ANSI_QUOTES' (bug #749)
 PostgreSQL: Export all FKs after all CREATE TABLE (PR #351)
 PostgreSQL: Fix dollar-quoted syntax highlighting (bug #738)
+PostgreSQL: Do not show view definition from other schema (PR #392)
 PostgreSQL 10: Support GENERATED ALWAYS BY IDENTITY (PR #386)
 Re-enable PHP warnings (regression from 4.7.8)