From 1d2570f462a565e5034658000c6cbb60f259b2dc Mon Sep 17 00:00:00 2001
From: Amjith Ramanujam <amjith@netflix.com>
Date: Thu, 6 May 2021 21:09:45 -0700
Subject: Include functions from search_path in completion.

---
 changelog.rst                             |  1 +
 pgcli/packages/pgliterals/pgliterals.json |  2 --
 pgcli/pgcompleter.py                      | 19 +++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/changelog.rst b/changelog.rst
index 4fd6fb28..21941499 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -7,6 +7,7 @@ Features:
 * Consider `update` queries destructive and issue a warning. Change
   `destructive_warning` setting to `all|moderate|off`, vs `true|false`. (#1239)
 * Skip initial comment in .pg_session even if it doesn't start with '#'
+* Include functions from schemas in search_path. (`Amjith Ramanujam`_)
 
 Bug fixes:
 ----------
diff --git a/pgcli/packages/pgliterals/pgliterals.json b/pgcli/packages/pgliterals/pgliterals.json
index 5c292e6d..df00817a 100644
--- a/pgcli/packages/pgliterals/pgliterals.json
+++ b/pgcli/packages/pgliterals/pgliterals.json
@@ -327,8 +327,6 @@
         "FIRST_VALUE",
         "FLOOR",
         "FORMAT",
-        "GENERATE_SERIES",
-        "GENERATE_SUBSCRIPTS",
         "GET_BIT",
         "GET_BYTE",
         "HEIGHT",
diff --git a/pgcli/pgcompleter.py b/pgcli/pgcompleter.py
index 79be274e..269b810f 100644
--- a/pgcli/pgcompleter.py
+++ b/pgcli/pgcompleter.py
@@ -491,11 +491,14 @@ class PGCompleter(Completer):
 
     def get_column_matches(self, suggestion, word_before_cursor):
         tables = suggestion.table_refs
-        do_qualify = suggestion.qualifiable and {
-            "always": True,
-            "never": False,
-            "if_more_than_one_table": len(tables) > 1,
-        }[self.qualify_columns]
+        do_qualify = (
+            suggestion.qualifiable
+            and {
+                "always": True,
+                "never": False,
+                "if_more_than_one_table": len(tables) > 1,
+            }[self.qualify_columns]
+        )
         qualify = lambda col, tbl: (
             (tbl + "." + self.case(col)) if do_qualify else self.case(col)
         )
@@ -703,7 +706,11 @@ class PGCompleter(Completer):
                     not f.is_aggregate
                     and not f.is_window
                     and not f.is_extension
-                    and (f.is_public or f.schema_name == suggestion.schema)
+                    and (
+                        f.is_public
+                        or f.schema_name in self.search_path
+                        or f.schema_name == suggestion.schema
+                    )
                 )
 
         else:
-- 
cgit v1.2.3