From: Ivan Masár <helix84@centrum.sk>
Date: Sun, 31 May 2020 21:40:51 +0000 (+0200)
Subject: PostgreSQL: Fix current schema in view definition
X-Git-Tag: v4.7.9~32
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=96be9139944c981717d85c3aae847aedeab5e3cf;p=adminer.git

PostgreSQL: Fix current schema in view definition
---

diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index 8abcaba7..409f64a0 100644
--- 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 ec16cd74..9502f6dc 100644
--- 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)