Subject: Re: IF (NOT) EXISTS in psql-completion
To: Pavel Stehule <pavel.stehule@gmail.com>,
 Kyotaro HORIGUCHI <horiguchi.kyotaro@lab.ntt.co.jp>
References: 
 <CAFj8pRDO97DxLHnj8FHSXVRMoaZWotWPK8b1O3izjgaODPZU1w@mail.gmail.com>
 <CAFj8pRBCv3hkruPivtcOA3ijYN2-jWo6L8h=4t7nZCYt38KE4A@mail.gmail.com>
 <56F17977.8040503@pgmasters.net>
 <20160329.154307.130628969.horiguchi.kyotaro@lab.ntt.co.jp>
 <CAFj8pRDEPgGyMz2aXgTL33PuD7X+xieaO++wa+V9nQPQiYDMGQ@mail.gmail.com>
Cc: David Steele <david@pgmasters.net>, Peter Eisentraut <peter_e@gmx.net>,
 PostgreSQL Hackers <pgsql-hackers@postgresql.org>
From: Artur Zakirov <a.zakirov@postgrespro.ru>
Message-ID: <56FA50B9.7000107@postgrespro.ru>
Date: Tue, 29 Mar 2016 12:54:01 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.6.0
MIME-Version: 1.0
In-Reply-To: 
 <CAFj8pRDEPgGyMz2aXgTL33PuD7X+xieaO++wa+V9nQPQiYDMGQ@mail.gmail.com>
Content-Type: multipart/mixed;
 boundary="------------010007080802060100050904"
Precedence: bulk
Sender: pgsql-hackers-owner@postgresql.org

This is a multi-part message in MIME format.
--------------010007080802060100050904
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

On 29.03.2016 10:59, Pavel Stehule wrote:
> Hi
>
> 2016-03-29 8:43 GMT+02:00 Kyotaro HORIGUCHI
> <horiguchi.kyotaro@lab.ntt.co.jp <mailto:horiguchi.kyotaro@lab.ntt.co.jp>>:
>
>     Thank you Pavel, David.
>
>     Thank you for pointing syntaxes to be addressed. Most of the are
>     addressed in the attached patch.
>
>
>     At Tue, 22 Mar 2016 12:57:27 -0400, David Steele
>     <david@pgmasters.net <mailto:david@pgmasters.net>> wrote in
>     <56F17977.8040503@pgmasters.net <mailto:56F17977.8040503@pgmasters.net>>
>     > Hi Kyotaro,
>     >
>     > On 3/18/16 3:22 AM, Pavel Stehule wrote:
>     >
>     > >     I am looking this patch. It looks well, but this feature doesn't
>     > >     respect upper or lower chars. It enforce upper chars. This is not
>     > >     consistent with any other autocomplete.
>
>     As mentioned before, upper-lower problem is an existing
>     issue. The case of the words in a query result list cannot be
>     edited since it may contain words that should not be changed,
>     such as relation names. So we can address it only before issueing
>     a query but I haven't found simple way to do it.
>
>
> This is unpleasant. I am sorry. I had very uncomfortable feeling from
> this behave. I am thinking so it should be solvable - you have to
> convert only keyword IF EXISTS or IF NOT EXISTS. Maybe there are not
> trivial solution, but this should be fixed.
>

Hello,

Can we do something like in the patch? This patch should be applied 
after the patch 
"0001-Suggest-IF-NOT-EXISTS-for-tab-completion-of-psql_v3.patch".

-- 
Artur Zakirov
Postgres Professional: http://www.postgrespro.com
Russian Postgres Company

--------------010007080802060100050904
Content-Type: text/x-patch;
 name="tab-complete.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="tab-complete.patch"

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 73c5601..ed4ff09 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -153,6 +153,7 @@ do { \
 do { \
 	completion_squery = &(query); \
 	completion_charp = addon; \
+	completion_case_sensitive = false; \
 	matches = completion_matches(text, complete_from_schema_query); \
 } while (0)
 
@@ -3754,7 +3755,17 @@ _complete_from_query(int is_schema_query, const char *text, int state)
 		while (list_index < PQntuples(result) &&
 			   (item = PQgetvalue(result, list_index++, 0)))
 			if (pg_strncasecmp(text, item, byte_length) == 0)
-				return pg_strdup(item);
+			{
+				if (completion_case_sensitive)
+					return pg_strdup(item);
+				else
+
+					/*
+					 * If case insensitive matching was requested initially,
+					 * adjust the case according to setting.
+					 */
+					return pg_strdup_keyword_case(item, text);
+			}
 	}
 
 	/* If nothing matches, free the db structure and return null */

--------------010007080802060100050904
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0


-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

--------------010007080802060100050904--