Skip to content

Commit 67dc4ee

Browse files
robertmhaasrobertmhaas
committed
Remove ancient downcasing code from procedural language operations.
A very long time ago, language names were specified as literals rather than identifiers, so this code was added to do case-folding. But that style has ben deprecated for many years so this isn't needed any more. Language names will still be downcased when specified as unquoted identifiers, but quoted identifiers or the old style using string literals will be left as-is.
1 parent ee3ef8f commit 67dc4ee

File tree

5 files changed

+17
-60
lines changed

5 files changed

+17
-60
lines changed

‎doc/src/sgml/ref/create_language.sgml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,8 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
143143

144144
<listitem>
145145
<para>
146-
The name of the new procedural language. The language name is
147-
case insensitive. The name must be unique among the languages
148-
in the database.
146+
The name of the new procedural language.
147+
The name must be unique among the languages in the database.
149148
</para>
150149

151150
<para>

‎src/backend/commands/define.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,6 @@
4242
#include "parser/scansup.h"
4343
#include "utils/int8.h"
4444

45-
46-
/*
47-
* Translate the input language name to lower case, and truncate if needed.
48-
*
49-
* Returns a palloc'd string
50-
*/
51-
char *
52-
case_translate_language_name(const char *input)
53-
{
54-
return downcase_truncate_identifier(input, strlen(input), false);
55-
}
56-
57-
5845
/*
5946
* Extract a string value (otherwise uninterpreted) from a DefElem.
6047
*/

‎src/backend/commands/functioncmds.c

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,6 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
779779
Oid prorettype;
780780
bool returnsSet;
781781
char *language;
782-
char *languageName;
783782
Oid languageOid;
784783
Oid languageValidator;
785784
char *funcname;
@@ -828,16 +827,13 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
828827
&isStrict, &security,
829828
&proconfig, &procost, &prorows);
830829

831-
/* Convert language name to canonical case */
832-
languageName = case_translate_language_name(language);
833-
834830
/* Look up the language and validate permissions */
835-
languageTuple = SearchSysCache1(LANGNAME, PointerGetDatum(languageName));
831+
languageTuple = SearchSysCache1(LANGNAME, PointerGetDatum(language));
836832
if (!HeapTupleIsValid(languageTuple))
837833
ereport(ERROR,
838834
(errcode(ERRCODE_UNDEFINED_OBJECT),
839-
errmsg("language \"%s\" does not exist", languageName),
840-
(PLTemplateExists(languageName) ?
835+
errmsg("language \"%s\" does not exist", language),
836+
(PLTemplateExists(language) ?
841837
errhint("Use CREATE LANGUAGE to load the language into the database.") : 0)));
842838

843839
languageOid = HeapTupleGetOid(languageTuple);
@@ -906,7 +902,7 @@ CreateFunction(CreateFunctionStmt *stmt, const char *queryString)
906902

907903
compute_attributes_with_style(stmt->withClause, &isStrict, &volatility);
908904

909-
interpret_AS_clause(languageOid, languageName, funcname, as_clause,
905+
interpret_AS_clause(languageOid, language, funcname, as_clause,
910906
&prosrc_str, &probin_str);
911907

912908
/*
@@ -1964,7 +1960,6 @@ ExecuteDoStmt(DoStmt *stmt)
19641960
DefElem *as_item = NULL;
19651961
DefElem *language_item = NULL;
19661962
char *language;
1967-
char *languageName;
19681963
Oid laninline;
19691964
HeapTuple languageTuple;
19701965
Form_pg_language languageStruct;
@@ -2008,16 +2003,13 @@ ExecuteDoStmt(DoStmt *stmt)
20082003
else
20092004
language = "plpgsql";
20102005

2011-
/* Convert language name to canonical case */
2012-
languageName = case_translate_language_name(language);
2013-
20142006
/* Look up the language and validate permissions */
2015-
languageTuple = SearchSysCache1(LANGNAME, PointerGetDatum(languageName));
2007+
languageTuple = SearchSysCache1(LANGNAME, PointerGetDatum(language));
20162008
if (!HeapTupleIsValid(languageTuple))
20172009
ereport(ERROR,
20182010
(errcode(ERRCODE_UNDEFINED_OBJECT),
2019-
errmsg("language \"%s\" does not exist", languageName),
2020-
(PLTemplateExists(languageName) ?
2011+
errmsg("language \"%s\" does not exist", language),
2012+
(PLTemplateExists(language) ?
20212013
errhint("Use CREATE LANGUAGE to load the language into the database.") : 0)));
20222014

20232015
codeblock->langOid = HeapTupleGetOid(languageTuple);

‎src/backend/commands/proclang.c

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,18 @@ static void AlterLanguageOwner_internal(HeapTuple tup, Relation rel,
6464
void
6565
CreateProceduralLanguage(CreatePLangStmt *stmt)
6666
{
67-
char *languageName;
6867
PLTemplate *pltemplate;
6968
Oid handlerOid,
7069
inlineOid,
7170
valOid;
7271
Oid funcrettype;
7372
Oid funcargtypes[1];
7473

75-
/*
76-
* Translate the language name to lower case
77-
*/
78-
languageName = case_translate_language_name(stmt->plname);
79-
8074
/*
8175
* If we have template information for the language, ignore the supplied
8276
* parameters (if any) and use the template information.
8377
*/
84-
if ((pltemplate = find_language_template(languageName)) != NULL)
78+
if ((pltemplate = find_language_template(stmt->plname)) != NULL)
8579
{
8680
List *funcname;
8781

@@ -101,7 +95,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
10195
ereport(ERROR,
10296
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
10397
errmsg("must be superuser to create procedural language \"%s\"",
104-
languageName)));
98+
stmt->plname)));
10599
if (!pg_database_ownercheck(MyDatabaseId, GetUserId()))
106100
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
107101
get_database_name(MyDatabaseId));
@@ -226,7 +220,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
226220
valOid = InvalidOid;
227221

228222
/* ok, create it */
229-
create_proc_lang(languageName, stmt->replace, GetUserId(),
223+
create_proc_lang(stmt->plname, stmt->replace, GetUserId(),
230224
handlerOid, inlineOid,
231225
valOid, pltemplate->tmpltrusted);
232226
}
@@ -241,7 +235,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
241235
ereport(ERROR,
242236
(errcode(ERRCODE_UNDEFINED_OBJECT),
243237
errmsg("unsupported language \"%s\"",
244-
languageName),
238+
stmt->plname),
245239
errhint("The supported languages are listed in the pg_pltemplate system catalog.")));
246240

247241
/*
@@ -301,7 +295,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
301295
valOid = InvalidOid;
302296

303297
/* ok, create it */
304-
create_proc_lang(languageName, stmt->replace, GetUserId(),
298+
create_proc_lang(stmt->plname, stmt->replace, GetUserId(),
305299
handlerOid, inlineOid,
306300
valOid, stmt->pltrusted);
307301
}
@@ -521,21 +515,15 @@ PLTemplateExists(const char *languageName)
521515
void
522516
DropProceduralLanguage(DropPLangStmt *stmt)
523517
{
524-
char *languageName;
525518
Oid oid;
526519
ObjectAddress object;
527520

528-
/*
529-
* Translate the language name, check that the language exists
530-
*/
531-
languageName = case_translate_language_name(stmt->plname);
532-
533-
oid = get_language_oid(languageName, stmt->missing_ok);
521+
oid = get_language_oid(stmt->plname, stmt->missing_ok);
534522
if (!OidIsValid(oid))
535523
{
536524
ereport(NOTICE,
537525
(errmsg("language \"%s\" does not exist, skipping",
538-
languageName)));
526+
stmt->plname)));
539527
return;
540528
}
541529

@@ -544,7 +532,7 @@ DropProceduralLanguage(DropPLangStmt *stmt)
544532
*/
545533
if (!pg_language_ownercheck(oid, GetUserId()))
546534
aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_LANGUAGE,
547-
languageName);
535+
stmt->plname);
548536

549537
object.classId = LanguageRelationId;
550538
object.objectId = oid;
@@ -587,10 +575,6 @@ RenameLanguage(const char *oldname, const char *newname)
587575
HeapTuple tup;
588576
Relation rel;
589577

590-
/* Translate both names for consistency with CREATE */
591-
oldname = case_translate_language_name(oldname);
592-
newname = case_translate_language_name(newname);
593-
594578
rel = heap_open(LanguageRelationId, RowExclusiveLock);
595579

596580
tup = SearchSysCacheCopy1(LANGNAME, CStringGetDatum(oldname));
@@ -628,9 +612,6 @@ AlterLanguageOwner(const char *name, Oid newOwnerId)
628612
HeapTuple tup;
629613
Relation rel;
630614

631-
/* Translate name for consistency with CREATE */
632-
name = case_translate_language_name(name);
633-
634615
rel = heap_open(LanguageRelationId, RowExclusiveLock);
635616

636617
tup = SearchSysCache1(LANGNAME, CStringGetDatum(name));

‎src/include/commands/defrem.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ extern Datum transformGenericOptions(Oid catalogId,
174174

175175
/* support routines in commands/define.c */
176176

177-
extern char *case_translate_language_name(const char *input);
178-
179177
extern char *defGetString(DefElem *def);
180178
extern double defGetNumeric(DefElem *def);
181179
extern bool defGetBoolean(DefElem *def);

0 commit comments

Comments
 (0)