From a4374f90703baf8c74b2bcc074ead2e7253d5b9a Mon Sep 17 00:00:00 2001
From: Neil Conway <neilc@samurai.com>
Date: Fri, 27 May 2005 00:57:49 +0000
Subject: [PATCH] Remove second argument from textToQualifiedNameList(), as it
is no longer used. From Jaime Casanova.
---
contrib/dblink/dblink.c | 2 +-
contrib/dbsize/dbsize.c | 5 ++---
contrib/pgstattuple/pgstattuple.c | 5 ++---
src/backend/catalog/pg_conversion.c | 4 ++--
src/backend/commands/sequence.c | 14 +++++---------
src/backend/utils/adt/acl.c | 5 ++---
src/backend/utils/adt/not_in.c | 4 ++--
src/backend/utils/adt/ruleutils.c | 11 ++++-------
src/backend/utils/adt/tid.c | 5 ++---
src/backend/utils/adt/varlena.c | 4 ++--
src/include/utils/builtins.h | 4 ++--
11 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index f832573000c..f23151ac146 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -1971,7 +1971,7 @@ get_relid_from_relname(text *relname_text)
Relation rel;
Oid relid;
- relvar = makeRangeVarFromNameList(textToQualifiedNameList(relname_text, "get_relid_from_relname"));
+ relvar = makeRangeVarFromNameList(textToQualifiedNameList(relname_text));
rel = heap_openrv(relvar, AccessShareLock);
relid = RelationGetRelid(rel);
relation_close(rel, AccessShareLock);
diff --git a/contrib/dbsize/dbsize.c b/contrib/dbsize/dbsize.c
index f6ed57d4638..afa1937145c 100644
--- a/contrib/dbsize/dbsize.c
+++ b/contrib/dbsize/dbsize.c
@@ -5,7 +5,7 @@
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/contrib/dbsize/dbsize.c,v 1.16 2005/01/01 05:43:05 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/dbsize/dbsize.c,v 1.17 2005/05/27 00:57:48 neilc Exp $
*
*/
@@ -290,8 +290,7 @@ relation_size(PG_FUNCTION_ARGS)
Oid relnodeOid;
Oid tblspcOid;
- relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname,
- "relation_size"));
+ relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
relation = relation_openrv(relrv, AccessShareLock);
tblspcOid = relation->rd_rel->reltablespace;
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index e2fab7863eb..db4b37def0e 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.17 2004/10/15 22:39:38 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.18 2005/05/27 00:57:49 neilc Exp $
*
* Copyright (c) 2001,2002 Tatsuo Ishii
*
@@ -63,8 +63,7 @@ pgstattuple(PG_FUNCTION_ARGS)
Datum result;
/* open relation */
- relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname,
- "pgstattuple"));
+ relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = heap_openrv(relrv, AccessShareLock);
result = pgstattuple_real(rel);
diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 57d125aed53..797583f6c04 100644
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.22 2005/04/14 20:03:23 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.23 2005/05/27 00:57:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -298,7 +298,7 @@ pg_convert_using(PG_FUNCTION_ARGS)
*(str + len) = '\0';
/* Look up the conversion name */
- parsed_name = textToQualifiedNameList(conv_name, "convert_using");
+ parsed_name = textToQualifiedNameList(conv_name);
convoid = FindConversionByName(parsed_name);
if (!OidIsValid(convoid))
ereport(ERROR,
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 6da6d835c27..69e8cd039ed 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.119 2004/12/31 21:59:41 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.120 2005/05/27 00:57:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -387,8 +387,7 @@ nextval(PG_FUNCTION_ARGS)
rescnt = 0;
bool logit = false;
- sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin,
- "nextval"));
+ sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
/* open and AccessShareLock sequence */
init_sequence(sequence, &elm, &seqrel);
@@ -579,8 +578,7 @@ currval(PG_FUNCTION_ARGS)
Relation seqrel;
int64 result;
- sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin,
- "currval"));
+ sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
/* open and AccessShareLock sequence */
init_sequence(sequence, &elm, &seqrel);
@@ -715,8 +713,7 @@ setval(PG_FUNCTION_ARGS)
int64 next = PG_GETARG_INT64(1);
RangeVar *sequence;
- sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin,
- "setval"));
+ sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
do_setval(sequence, next, true);
@@ -735,8 +732,7 @@ setval_and_iscalled(PG_FUNCTION_ARGS)
bool iscalled = PG_GETARG_BOOL(2);
RangeVar *sequence;
- sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin,
- "setval"));
+ sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
do_setval(sequence, next, iscalled);
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 9e0eddf0dc1..68b34f3dce5 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.113 2004/12/31 22:01:21 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.114 2005/05/27 00:57:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1425,8 +1425,7 @@ convert_table_name(text *tablename)
{
RangeVar *relrv;
- relrv = makeRangeVarFromNameList(textToQualifiedNameList(tablename,
- "has_table_privilege"));
+ relrv = makeRangeVarFromNameList(textToQualifiedNameList(tablename));
return RangeVarGetRelid(relrv, false);
}
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 1530f333a3a..fc640b9a403 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/not_in.c,v 1.42 2004/12/31 22:01:22 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/not_in.c,v 1.43 2005/05/27 00:57:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -56,7 +56,7 @@ int4notin(PG_FUNCTION_ARGS)
/* Parse the argument */
- names = textToQualifiedNameList(relation_and_attr, "int4notin");
+ names = textToQualifiedNameList(relation_and_attr);
nnames = list_length(names);
if (nnames < 2)
ereport(ERROR,
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 0c2d4ffa8c2..56813eec39d 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
* back to source text
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.195 2005/05/01 18:56:18 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.196 2005/05/27 00:57:49 neilc Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -349,8 +349,7 @@ pg_get_viewdef_name(PG_FUNCTION_ARGS)
RangeVar *viewrel;
Oid viewoid;
- viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname,
- "get_viewdef"));
+ viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname));
viewoid = RangeVarGetRelid(viewrel, false);
PG_RETURN_TEXT_P(string_to_text(pg_get_viewdef_worker(viewoid, 0)));
@@ -368,8 +367,7 @@ pg_get_viewdef_name_ext(PG_FUNCTION_ARGS)
Oid viewoid;
prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : 0;
- viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname,
- "get_viewdef"));
+ viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname));
viewoid = RangeVarGetRelid(viewrel, false);
PG_RETURN_TEXT_P(string_to_text(pg_get_viewdef_worker(viewoid, prettyFlags)));
@@ -1252,8 +1250,7 @@ pg_get_serial_sequence(PG_FUNCTION_ARGS)
HeapTuple tup;
/* Get the OID of the table */
- tablerv = makeRangeVarFromNameList(textToQualifiedNameList(tablename,
- "pg_get_serial_sequence"));
+ tablerv = makeRangeVarFromNameList(textToQualifiedNameList(tablename));
tableOid = RangeVarGetRelid(tablerv, false);
/* Get the number of the column */
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 10b98688a24..ba33ce50ee5 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.48 2004/12/31 22:01:22 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.49 2005/05/27 00:57:49 neilc Exp $
*
* NOTES
* input routine largely stolen from boxin().
@@ -302,8 +302,7 @@ currtid_byrelname(PG_FUNCTION_ARGS)
RangeVar *relrv;
Relation rel;
- relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname,
- "currtid_byrelname"));
+ relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
rel = heap_openrv(relrv, AccessShareLock);
if (rel->rd_rel->relkind == RELKIND_VIEW)
return currtid_for_view(rel, tid);
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index 14dfcb6335e..c07f4f8f02c 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.121 2005/05/20 01:29:55 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.122 2005/05/27 00:57:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1618,7 +1618,7 @@ name_text(PG_FUNCTION_ARGS)
* truncate names if they're too long.
*/
List *
-textToQualifiedNameList(text *textval, const char *caller)
+textToQualifiedNameList(text *textval)
{
char *rawname;
List *result = NIL;
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 865c673f512..b781a270c60 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.256 2005/05/20 01:29:55 neilc Exp $
+ * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.257 2005/05/27 00:57:49 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -562,7 +562,7 @@ extern Datum text_substr_no_len(PG_FUNCTION_ARGS);
extern Datum name_text(PG_FUNCTION_ARGS);
extern Datum text_name(PG_FUNCTION_ARGS);
extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2);
-extern List *textToQualifiedNameList(text *textval, const char *caller);
+extern List *textToQualifiedNameList(text *textval);
extern bool SplitIdentifierString(char *rawstring, char separator,
List **namelist);
extern Datum replace_text(PG_FUNCTION_ARGS);
--
GitLab