From 6c6871f25eb9f7e5bdcc1005dab4cdd29a15b7d0 Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Fri, 26 Feb 2016 14:24:42 +0900 Subject: [PATCH] Fix identifier completion with multibyte characters. _copletion_from_query wrongly takes the byte length of the given text instead of character length. This prevents multibyte identifiers from showing as candidates for completion. This patch fixes it. --- src/bin/psql/tab-complete.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 5f27120..952db3a 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -3197,8 +3197,8 @@ complete_from_schema_query(const char *text, int state) static char * _complete_from_query(int is_schema_query, const char *text, int state) { - static int list_index, - string_length; + static int list_index; + int string_length = 0; static PGresult *result = NULL; /* @@ -3211,9 +3211,16 @@ _complete_from_query(int is_schema_query, const char *text, int state) char *e_text; char *e_info_charp; char *e_info_charp2; + const char *pstr = text; list_index = 0; - string_length = strlen(text); + + /* count length as a multibyte text */ + while (*pstr) + { + string_length++; + pstr += PQmblen(pstr, pset.encoding); + } /* Free any prior result */ PQclear(result); -- 1.8.3.1