Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita4374f9

Browse files
author
Neil Conway
committed
Remove second argument from textToQualifiedNameList(), as it is no longer
used. From Jaime Casanova.
1 parent357ea45 commita4374f9

File tree

11 files changed

+26
-37
lines changed

11 files changed

+26
-37
lines changed

‎contrib/dblink/dblink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ get_relid_from_relname(text *relname_text)
19711971
Relationrel;
19721972
Oidrelid;
19731973

1974-
relvar=makeRangeVarFromNameList(textToQualifiedNameList(relname_text,"get_relid_from_relname"));
1974+
relvar=makeRangeVarFromNameList(textToQualifiedNameList(relname_text));
19751975
rel=heap_openrv(relvar,AccessShareLock);
19761976
relid=RelationGetRelid(rel);
19771977
relation_close(rel,AccessShareLock);

‎contrib/dbsize/dbsize.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2002-2005, PostgreSQL Global Development Group
66
*
77
* IDENTIFICATION
8-
* $PostgreSQL: pgsql/contrib/dbsize/dbsize.c,v 1.16 2005/01/01 05:43:05 momjian Exp $
8+
* $PostgreSQL: pgsql/contrib/dbsize/dbsize.c,v 1.17 2005/05/27 00:57:48 neilc Exp $
99
*
1010
*/
1111

@@ -290,8 +290,7 @@ relation_size(PG_FUNCTION_ARGS)
290290
OidrelnodeOid;
291291
OidtblspcOid;
292292

293-
relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname,
294-
"relation_size"));
293+
relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname));
295294
relation=relation_openrv(relrv,AccessShareLock);
296295

297296
tblspcOid=relation->rd_rel->reltablespace;

‎contrib/pgstattuple/pgstattuple.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.17 2004/10/15 22:39:38 tgl Exp $
2+
* $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.18 2005/05/27 00:57:49 neilc Exp $
33
*
44
* Copyright (c) 2001,2002Tatsuo Ishii
55
*
@@ -63,8 +63,7 @@ pgstattuple(PG_FUNCTION_ARGS)
6363
Datumresult;
6464

6565
/* open relation */
66-
relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname,
67-
"pgstattuple"));
66+
relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname));
6867
rel=heap_openrv(relrv,AccessShareLock);
6968

7069
result=pgstattuple_real(rel);

‎src/backend/catalog/pg_conversion.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.22 2005/04/14 20:03:23 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_conversion.c,v 1.23 2005/05/27 00:57:49 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -298,7 +298,7 @@ pg_convert_using(PG_FUNCTION_ARGS)
298298
*(str+len)='\0';
299299

300300
/* Look up the conversion name */
301-
parsed_name=textToQualifiedNameList(conv_name,"convert_using");
301+
parsed_name=textToQualifiedNameList(conv_name);
302302
convoid=FindConversionByName(parsed_name);
303303
if (!OidIsValid(convoid))
304304
ereport(ERROR,

‎src/backend/commands/sequence.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.119 2004/12/31 21:59:41 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.120 2005/05/27 00:57:49 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -387,8 +387,7 @@ nextval(PG_FUNCTION_ARGS)
387387
rescnt=0;
388388
boollogit= false;
389389

390-
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin,
391-
"nextval"));
390+
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin));
392391

393392
/* open and AccessShareLock sequence */
394393
init_sequence(sequence,&elm,&seqrel);
@@ -579,8 +578,7 @@ currval(PG_FUNCTION_ARGS)
579578
Relationseqrel;
580579
int64result;
581580

582-
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin,
583-
"currval"));
581+
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin));
584582

585583
/* open and AccessShareLock sequence */
586584
init_sequence(sequence,&elm,&seqrel);
@@ -715,8 +713,7 @@ setval(PG_FUNCTION_ARGS)
715713
int64next=PG_GETARG_INT64(1);
716714
RangeVar*sequence;
717715

718-
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin,
719-
"setval"));
716+
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin));
720717

721718
do_setval(sequence,next, true);
722719

@@ -735,8 +732,7 @@ setval_and_iscalled(PG_FUNCTION_ARGS)
735732
booliscalled=PG_GETARG_BOOL(2);
736733
RangeVar*sequence;
737734

738-
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin,
739-
"setval"));
735+
sequence=makeRangeVarFromNameList(textToQualifiedNameList(seqin));
740736

741737
do_setval(sequence,next,iscalled);
742738

‎src/backend/utils/adt/acl.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.113 2004/12/31 22:01:21 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.114 2005/05/27 00:57:49 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1425,8 +1425,7 @@ convert_table_name(text *tablename)
14251425
{
14261426
RangeVar*relrv;
14271427

1428-
relrv=makeRangeVarFromNameList(textToQualifiedNameList(tablename,
1429-
"has_table_privilege"));
1428+
relrv=makeRangeVarFromNameList(textToQualifiedNameList(tablename));
14301429

14311430
returnRangeVarGetRelid(relrv, false);
14321431
}

‎src/backend/utils/adt/not_in.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/not_in.c,v 1.42 2004/12/31 22:01:22 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/not_in.c,v 1.43 2005/05/27 00:57:49 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -56,7 +56,7 @@ int4notin(PG_FUNCTION_ARGS)
5656

5757
/* Parse the argument */
5858

59-
names=textToQualifiedNameList(relation_and_attr,"int4notin");
59+
names=textToQualifiedNameList(relation_and_attr);
6060
nnames=list_length(names);
6161
if (nnames<2)
6262
ereport(ERROR,

‎src/backend/utils/adt/ruleutils.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*back to source text
44
*
55
* IDENTIFICATION
6-
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.195 2005/05/01 18:56:18 tgl Exp $
6+
* $PostgreSQL: pgsql/src/backend/utils/adt/ruleutils.c,v 1.196 2005/05/27 00:57:49 neilc Exp $
77
*
88
* This software is copyrighted by Jan Wieck - Hamburg.
99
*
@@ -349,8 +349,7 @@ pg_get_viewdef_name(PG_FUNCTION_ARGS)
349349
RangeVar*viewrel;
350350
Oidviewoid;
351351

352-
viewrel=makeRangeVarFromNameList(textToQualifiedNameList(viewname,
353-
"get_viewdef"));
352+
viewrel=makeRangeVarFromNameList(textToQualifiedNameList(viewname));
354353
viewoid=RangeVarGetRelid(viewrel, false);
355354

356355
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)
368367
Oidviewoid;
369368

370369
prettyFlags=pretty ?PRETTYFLAG_PAREN |PRETTYFLAG_INDENT :0;
371-
viewrel=makeRangeVarFromNameList(textToQualifiedNameList(viewname,
372-
"get_viewdef"));
370+
viewrel=makeRangeVarFromNameList(textToQualifiedNameList(viewname));
373371
viewoid=RangeVarGetRelid(viewrel, false);
374372

375373
PG_RETURN_TEXT_P(string_to_text(pg_get_viewdef_worker(viewoid,prettyFlags)));
@@ -1252,8 +1250,7 @@ pg_get_serial_sequence(PG_FUNCTION_ARGS)
12521250
HeapTupletup;
12531251

12541252
/* Get the OID of the table */
1255-
tablerv=makeRangeVarFromNameList(textToQualifiedNameList(tablename,
1256-
"pg_get_serial_sequence"));
1253+
tablerv=makeRangeVarFromNameList(textToQualifiedNameList(tablename));
12571254
tableOid=RangeVarGetRelid(tablerv, false);
12581255

12591256
/* Get the number of the column */

‎src/backend/utils/adt/tid.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.48 2004/12/31 22:01:22 pgsql Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.49 2005/05/27 00:57:49 neilc Exp $
1212
*
1313
* NOTES
1414
* input routine largely stolen from boxin().
@@ -302,8 +302,7 @@ currtid_byrelname(PG_FUNCTION_ARGS)
302302
RangeVar*relrv;
303303
Relationrel;
304304

305-
relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname,
306-
"currtid_byrelname"));
305+
relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname));
307306
rel=heap_openrv(relrv,AccessShareLock);
308307
if (rel->rd_rel->relkind==RELKIND_VIEW)
309308
returncurrtid_for_view(rel,tid);

‎src/backend/utils/adt/varlena.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.121 2005/05/20 01:29:55 neilc Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.122 2005/05/27 00:57:49 neilc Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1618,7 +1618,7 @@ name_text(PG_FUNCTION_ARGS)
16181618
* truncate names if they're too long.
16191619
*/
16201620
List*
1621-
textToQualifiedNameList(text*textval,constchar*caller)
1621+
textToQualifiedNameList(text*textval)
16221622
{
16231623
char*rawname;
16241624
List*result=NIL;

‎src/include/utils/builtins.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.256 2005/05/20 01:29:55 neilc Exp $
10+
* $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.257 2005/05/27 00:57:49 neilc Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -562,7 +562,7 @@ extern Datum text_substr_no_len(PG_FUNCTION_ARGS);
562562
externDatumname_text(PG_FUNCTION_ARGS);
563563
externDatumtext_name(PG_FUNCTION_ARGS);
564564
externintvarstr_cmp(char*arg1,intlen1,char*arg2,intlen2);
565-
externList*textToQualifiedNameList(text*textval,constchar*caller);
565+
externList*textToQualifiedNameList(text*textval);
566566
externboolSplitIdentifierString(char*rawstring,charseparator,
567567
List**namelist);
568568
externDatumreplace_text(PG_FUNCTION_ARGS);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp