diff --git a/orig/postgresql-9.0beta2/src/backend/parser/scansup.c b/postgresql-9.0beta2/src/backend/parser/scansup.c index 94082f7..179b37e 100644 --- a/orig/postgresql-9.0beta2/src/backend/parser/scansup.c +++ b/postgresql-9.0beta2/src/backend/parser/scansup.c @@ -129,33 +129,11 @@ char * downcase_truncate_identifier(const char *ident, int len, bool warn) { char *result; - int i; - - result = palloc(len + 1); - - /* - * SQL99 specifies Unicode-aware case normalization, which we don't yet - * have the infrastructure for. Instead we use tolower() to provide a - * locale-aware translation. However, there are some locales where this - * is not right either (eg, Turkish may do strange things with 'i' and - * 'I'). Our current compromise is to use tolower() for characters with - * the high bit set, and use an ASCII-only downcasing for 7-bit - * characters. - */ - for (i = 0; i < len; i++) - { - unsigned char ch = (unsigned char) ident[i]; - if (ch >= 'A' && ch <= 'Z') - ch += 'a' - 'A'; - else if (IS_HIGHBIT_SET(ch) && isupper(ch)) - ch = tolower(ch); - result[i] = (char) ch; - } - result[i] = '\0'; + result = str_tolower(ident, len); - if (i >= NAMEDATALEN) - truncate_identifier(result, i, warn); + if (len >= NAMEDATALEN) + truncate_identifier(result, len, warn); return result; }