mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove second argument from textToQualifiedNameList(), as it is no longer

Browse Source 
used. From Jaime Casanova.
This commit is contained in:
Neil Conway 2005-05-27 00:57:49 +00:00
parent 357ea45b57
commit a4374f9070
11 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/dblink/dblink.c
View File

@ -1971,7 +1971,7 @@ get_relid_from_relname(text *relname_text)
Relation rel; Relation rel;
Oid relid; Oid relid;
relvar = makeRangeVarFromNameList(textToQualifiedNameList(relname_text, "get_relid_from_relname")); relvar = makeRangeVarFromNameList(textToQualifiedNameList(relname_text));
rel = heap_openrv(relvar, AccessShareLock); rel = heap_openrv(relvar, AccessShareLock);
relid = RelationGetRelid(rel); relid = RelationGetRelid(rel);
relation_close(rel, AccessShareLock); relation_close(rel, AccessShareLock);

5
contrib/dbsize/dbsize.c
View File

@ -5,7 +5,7 @@
* Copyright (c) 2002-2005, PostgreSQL Global Development Group * Copyright (c) 2002-2005, PostgreSQL Global Development Group
* *
* IDENTIFICATION * 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 relnodeOid;
Oid tblspcOid; Oid tblspcOid;
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname, relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
"relation_size"));
relation = relation_openrv(relrv, AccessShareLock); relation = relation_openrv(relrv, AccessShareLock);
tblspcOid = relation->rd_rel->reltablespace; tblspcOid = relation->rd_rel->reltablespace;

5
contrib/pgstattuple/pgstattuple.c
View File

@ -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 * Copyright (c) 2001,2002 Tatsuo Ishii
* *
@ -63,8 +63,7 @@ pgstattuple(PG_FUNCTION_ARGS)
Datum result; Datum result;
/* open relation */ /* open relation */
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname, relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
"pgstattuple"));
rel = heap_openrv(relrv, AccessShareLock); rel = heap_openrv(relrv, AccessShareLock);
result = pgstattuple_real(rel); result = pgstattuple_real(rel);

4
src/backend/catalog/pg_conversion.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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'; *(str + len) = '\0';
/* Look up the conversion name */ /* Look up the conversion name */
parsed_name = textToQualifiedNameList(conv_name, "convert_using"); parsed_name = textToQualifiedNameList(conv_name);
convoid = FindConversionByName(parsed_name); convoid = FindConversionByName(parsed_name);
if (!OidIsValid(convoid)) if (!OidIsValid(convoid))
ereport(ERROR, ereport(ERROR,

14
src/backend/commands/sequence.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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; rescnt = 0;
bool logit = false; bool logit = false;
sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin, sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
"nextval"));
/* open and AccessShareLock sequence */ /* open and AccessShareLock sequence */
init_sequence(sequence, &elm, &seqrel); init_sequence(sequence, &elm, &seqrel);
@ -579,8 +578,7 @@ currval(PG_FUNCTION_ARGS)
Relation seqrel; Relation seqrel;
int64 result; int64 result;
sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin, sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
"currval"));
/* open and AccessShareLock sequence */ /* open and AccessShareLock sequence */
init_sequence(sequence, &elm, &seqrel); init_sequence(sequence, &elm, &seqrel);
@ -715,8 +713,7 @@ setval(PG_FUNCTION_ARGS)
int64 next = PG_GETARG_INT64(1); int64 next = PG_GETARG_INT64(1);
RangeVar *sequence; RangeVar *sequence;
sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin, sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
"setval"));
do_setval(sequence, next, true); do_setval(sequence, next, true);
@ -735,8 +732,7 @@ setval_and_iscalled(PG_FUNCTION_ARGS)
bool iscalled = PG_GETARG_BOOL(2); bool iscalled = PG_GETARG_BOOL(2);
RangeVar *sequence; RangeVar *sequence;
sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin, sequence = makeRangeVarFromNameList(textToQualifiedNameList(seqin));
"setval"));
do_setval(sequence, next, iscalled); do_setval(sequence, next, iscalled);

5
src/backend/utils/adt/acl.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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; RangeVar *relrv;
relrv = makeRangeVarFromNameList(textToQualifiedNameList(tablename, relrv = makeRangeVarFromNameList(textToQualifiedNameList(tablename));
"has_table_privilege"));
return RangeVarGetRelid(relrv, false); return RangeVarGetRelid(relrv, false);
} }

4
src/backend/utils/adt/not_in.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 */ /* Parse the argument */
names = textToQualifiedNameList(relation_and_attr, "int4notin"); names = textToQualifiedNameList(relation_and_attr);
nnames = list_length(names); nnames = list_length(names);
if (nnames < 2) if (nnames < 2)
ereport(ERROR, ereport(ERROR,

11
src/backend/utils/adt/ruleutils.c
View File

@ -3,7 +3,7 @@
* back to source text * back to source text
* *
* IDENTIFICATION * 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. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -349,8 +349,7 @@ pg_get_viewdef_name(PG_FUNCTION_ARGS)
RangeVar *viewrel; RangeVar *viewrel;
Oid viewoid; Oid viewoid;
viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname, viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname));
"get_viewdef"));
viewoid = RangeVarGetRelid(viewrel, false); viewoid = RangeVarGetRelid(viewrel, false);
PG_RETURN_TEXT_P(string_to_text(pg_get_viewdef_worker(viewoid, 0))); 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; Oid viewoid;
prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : 0; prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : 0;
viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname, viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname));
"get_viewdef"));
viewoid = RangeVarGetRelid(viewrel, false); viewoid = RangeVarGetRelid(viewrel, false);
PG_RETURN_TEXT_P(string_to_text(pg_get_viewdef_worker(viewoid, prettyFlags))); 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; HeapTuple tup;
/* Get the OID of the table */ /* Get the OID of the table */
tablerv = makeRangeVarFromNameList(textToQualifiedNameList(tablename, tablerv = makeRangeVarFromNameList(textToQualifiedNameList(tablename));
"pg_get_serial_sequence"));
tableOid = RangeVarGetRelid(tablerv, false); tableOid = RangeVarGetRelid(tablerv, false);
/* Get the number of the column */ /* Get the number of the column */

5
src/backend/utils/adt/tid.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* input routine largely stolen from boxin(). * input routine largely stolen from boxin().
@ -302,8 +302,7 @@ currtid_byrelname(PG_FUNCTION_ARGS)
RangeVar *relrv; RangeVar *relrv;
Relation rel; Relation rel;
relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname, relrv = makeRangeVarFromNameList(textToQualifiedNameList(relname));
"currtid_byrelname"));
rel = heap_openrv(relrv, AccessShareLock); rel = heap_openrv(relrv, AccessShareLock);
if (rel->rd_rel->relkind == RELKIND_VIEW) if (rel->rd_rel->relkind == RELKIND_VIEW)
return currtid_for_view(rel, tid); return currtid_for_view(rel, tid);

4
src/backend/utils/adt/varlena.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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. * truncate names if they're too long.
*/ */
List * List *
textToQualifiedNameList(text *textval, const char *caller) textToQualifiedNameList(text *textval)
{ {
char *rawname; char *rawname;
List *result = NIL; List *result = NIL;

4
src/include/utils/builtins.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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 name_text(PG_FUNCTION_ARGS);
extern Datum text_name(PG_FUNCTION_ARGS); extern Datum text_name(PG_FUNCTION_ARGS);
extern int varstr_cmp(char *arg1, int len1, char *arg2, int len2); 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, extern bool SplitIdentifierString(char *rawstring, char separator,
List **namelist); List **namelist);
extern Datum replace_text(PG_FUNCTION_ARGS); extern Datum replace_text(PG_FUNCTION_ARGS);