From dfbaa16160a82b7e70603ba89e76804ba771b7e1 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 7 Feb 2004 00:57:22 +0400 Subject: 1. fixed bug @2593 "SHOW CREATE TABLE doesn't properly double quotes" 2. added automatic quotation of keywords in SHOW CREATE TABLE mysql-test/r/show_check.result: added tests for bug #2593 "SHOW CREATE TABLE doesn't properly double quotas" and for automatic quotation of keywords mysql-test/t/show_check.test: added tests for bug #2593 "SHOW CREATE TABLE doesn't properly double quotas" and for automatic quotation of keywords sql/mysql_priv.h: added declaration of function is_keyword sql/sql_lex.cc: added implementation of function is_keyword sql/sql_show.cc: changed function append_identifier and it's subfunctions 1. fixed bug @2593 "SHOW CREATE TABLE doesn't properly double quotes" 2. added automatic quotation of keywords --- sql/sql_show.cc | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 4 deletions(-) (limited to 'sql/sql_show.cc') diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 3b937f97089..5870e58d9a4 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1086,7 +1086,6 @@ mysqld_dump_create_info(THD *thd, TABLE *table, int fd) DBUG_RETURN(0); } -/* possible TODO: call find_keyword() from sql_lex.cc here */ static bool require_quotes(const char *name, uint length) { uint i, d, c; @@ -1100,17 +1099,47 @@ static bool require_quotes(const char *name, uint length) return 0; } +/* + Looking for char in multibyte string + + SYNOPSIS + look_for_char() + name string for looking at + length length of name + q '\'' or '\"' for looking for + + RETURN VALUES + # pointer to found char in string + 0 string doesn't contain required char +*/ + +static const char *look_for_char(const char *name, uint length, char q) +{ + const char *cur= name; + const char *end= cur+length; + uint symbol_length; + for (; curvariables.sql_mode & MODE_ANSI_QUOTES) qtype= '\"'; else qtype= '`'; - if ((thd->options & OPTION_QUOTE_SHOW_CREATE) || - require_quotes(name, length)) + if (is_keyword(name,length)) { packet->append(&qtype, 1); packet->append(name, length, system_charset_info); @@ -1118,7 +1147,35 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) } else { - packet->append(name, length, system_charset_info); + if (!require_quotes(name, length)) + { + if (!(thd->options & OPTION_QUOTE_SHOW_CREATE)) + packet->append(name, length, system_charset_info); + else + { + packet->append(&qtype, 1); + packet->append(name, length, system_charset_info); + packet->append(&qtype, 1); + } + } + else + { + packet->append(&qtype, 1); + qplace= look_for_char(name,length,qtype); + while (qplace) + { + if ((part_len= qplace-name)) + { + packet->append(name, part_len, system_charset_info); + length-= part_len; + } + packet->append(qplace, 1, system_charset_info); + name= qplace; + qplace= look_for_char(name+1,length-1,qtype); + } + packet->append(name, length, system_charset_info); + packet->append(&qtype, 1); + } } } -- cgit v1.2.1 From b3bf99ed42f6ae344cb646ea421ccba7fbaee69f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Feb 2004 00:28:00 +0400 Subject: some optimization in append_identifier (sql/sql_show.cc) sql/sql_show.cc: some optimization in append_identifier --- sql/sql_show.cc | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'sql/sql_show.cc') diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 5870e58d9a4..2d7b89a24a1 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1086,7 +1086,7 @@ mysqld_dump_create_info(THD *thd, TABLE *table, int fd) DBUG_RETURN(0); } -static bool require_quotes(const char *name, uint length) +static inline const char *require_quotes(const char *name, uint length) { uint i, d, c; for (i=0; iident_map[c]) - return 1; + return name+i; } return 0; } @@ -1113,7 +1113,8 @@ static bool require_quotes(const char *name, uint length) 0 string doesn't contain required char */ -static const char *look_for_char(const char *name, uint length, char q) +static inline const char *look_for_char(const char *name, + uint length, char q) { const char *cur= name; const char *end= cur+length; @@ -1141,27 +1142,29 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) if (is_keyword(name,length)) { - packet->append(&qtype, 1); + packet->append(&qtype, 1, system_charset_info); packet->append(name, length, system_charset_info); - packet->append(&qtype, 1); + packet->append(&qtype, 1, system_charset_info); } else { - if (!require_quotes(name, length)) + if (!(qplace= require_quotes(name, length))) { if (!(thd->options & OPTION_QUOTE_SHOW_CREATE)) packet->append(name, length, system_charset_info); else { - packet->append(&qtype, 1); + packet->append(&qtype, 1, system_charset_info); packet->append(name, length, system_charset_info); - packet->append(&qtype, 1); + packet->append(&qtype, 1, system_charset_info); } } else { - packet->append(&qtype, 1); - qplace= look_for_char(name,length,qtype); + packet->shrink(packet->length()+length+2); + packet->append(&qtype, 1, system_charset_info); + if (*qplace != qtype) + qplace= look_for_char(qplace+1,length-(qplace-name)-1,qtype); while (qplace) { if ((part_len= qplace-name)) @@ -1174,7 +1177,7 @@ append_identifier(THD *thd, String *packet, const char *name, uint length) qplace= look_for_char(name+1,length-1,qtype); } packet->append(name, length, system_charset_info); - packet->append(&qtype, 1); + packet->append(&qtype, 1, system_charset_info); } } } -- cgit v1.2.1