diff options
| author | Robert Haas <rhaas@postgresql.org> | 2015-04-02 10:10:22 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2015-04-02 10:10:22 -0400 |
| commit | 4cd639baf4bd35dd7fc924009203349b81bdcd68 (patch) | |
| tree | 257af95aee58af4bc460a73e4224b4609f9b8c5f /src/bin/psql/tab-complete.c | |
| parent | 7dae3cf68cf59c37163df42fb0d2b66fed9996f4 (diff) | |
Revert "psql: fix \connect with URIs and conninfo strings"
This reverts commit fcef1617295c074f2684c887627184d2fc26ac04, about
which both the buildfarm and my local machine are very unhappy.
Diffstat (limited to 'src/bin/psql/tab-complete.c')
| -rw-r--r-- | src/bin/psql/tab-complete.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index dd15f104525..dfcb66ba6de 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -52,7 +52,6 @@ #include "libpq-fe.h" #include "pqexpbuffer.h" #include "common.h" -#include "common/connstrings.h" #include "settings.h" #include "stringutils.h" @@ -3707,18 +3706,10 @@ psql_completion(const char *text, int start, int end) COMPLETE_WITH_LIST_CS(my_list); } - else if (strcmp(prev_wd, "\\connect") == 0 || strcmp(prev_wd, "\\c") == 0) - { - if (!libpq_connstring_is_recognized(text)) - COMPLETE_WITH_QUERY(Query_for_list_of_databases); - /* TODO: URI/service completion. Nothing for now */ - } + COMPLETE_WITH_QUERY(Query_for_list_of_databases); else if (strcmp(prev2_wd, "\\connect") == 0 || strcmp(prev2_wd, "\\c") == 0) - { - if (!libpq_connstring_is_recognized(prev_wd)) - COMPLETE_WITH_QUERY(Query_for_list_of_roles); - } + COMPLETE_WITH_QUERY(Query_for_list_of_roles); else if (strncmp(prev_wd, "\\da", strlen("\\da")) == 0) COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_aggregates, NULL); |