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

Commit6962f86

Browse files
author
Thomas G. Lockhart
committed
Clean up double-quotes around column and table names.
 Had too many in some cases because there was already a routine taking care of it.
1 parent7540af4 commit6962f86

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎src/bin/pg_dump/pg_dump.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*
2323
* IDENTIFICATION
24-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.79 1998/08/06 05:12:51 momjian Exp $
24+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.80 1998/08/25 15:02:04 thomas Exp $
2525
*
2626
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2727
*
@@ -221,15 +221,15 @@ dumpClasses_nodumpData(FILE *fout, const char *classname, const bool oids)
221221

222222
if (oids)
223223
{
224-
fprintf(fout,"COPY\"%s\" WITH OIDS FROM stdin;\n",
224+
fprintf(fout,"COPY%s WITH OIDS FROM stdin;\n",
225225
fmtId(classname));
226-
sprintf(query,"COPY\"%s\" WITH OIDS TO stdout;\n",
226+
sprintf(query,"COPY%s WITH OIDS TO stdout;\n",
227227
fmtId(classname));
228228
}
229229
else
230230
{
231-
fprintf(fout,"COPY\"%s\" FROM stdin;\n",fmtId(classname));
232-
sprintf(query,"COPY\"%s\" TO stdout;\n",fmtId(classname));
231+
fprintf(fout,"COPY%s FROM stdin;\n",fmtId(classname));
232+
sprintf(query,"COPY%s TO stdout;\n",fmtId(classname));
233233
}
234234
res=PQexec(g_conn,query);
235235
if (!res||
@@ -316,7 +316,7 @@ dumpClasses_dumpData(FILE *fout, const char *classname,
316316
inttuple;
317317
intfield;
318318

319-
sprintf(query,"SELECT * FROM\"%s\"",classname);
319+
sprintf(query,"SELECT * FROM%s",fmtId(classname));
320320
res=PQexec(g_conn,query);
321321
if (!res||
322322
PQresultStatus(res)!=PGRES_TUPLES_OK)
@@ -327,7 +327,7 @@ dumpClasses_dumpData(FILE *fout, const char *classname,
327327
tuple=0;
328328
while (tuple<PQntuples(res))
329329
{
330-
fprintf(fout,"INSERT INTO\"%s\" ",fmtId(classname));
330+
fprintf(fout,"INSERT INTO%s ",fmtId(classname));
331331
if (attrNames)
332332
{
333333
intj;
@@ -338,7 +338,7 @@ dumpClasses_dumpData(FILE *fout, const char *classname,
338338
{
339339
if (tblinfo.inhAttrs[j]==0)
340340
{
341-
sprintf(q,"%s%s\"%s\"",
341+
sprintf(q,"%s%s%s",
342342
q,
343343
(actual_atts>0) ?"," :"",
344344
fmtId(tblinfo.attnames[j]));
@@ -1570,7 +1570,7 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
15701570
exit_nicely(g_conn);
15711571
}
15721572
tgfunc=finfo[findx].proname;
1573-
sprintf(query,"CREATE TRIGGER\"%s\" ",PQgetvalue(res2,i2,i_tgname));
1573+
sprintf(query,"CREATE TRIGGER%s ",fmtId(PQgetvalue(res2,i2,i_tgname)));
15741574
/* Trigger type */
15751575
findx=0;
15761576
if (TRIGGER_FOR_BEFORE(tgtype))
@@ -1597,8 +1597,8 @@ getTables(int *numTables, FuncInfo *finfo, int numFuncs)
15971597
else
15981598
strcat(query," UPDATE");
15991599
}
1600-
sprintf(query,"%s ON\"%s\" FOR EACH ROW EXECUTE PROCEDURE %s (",
1601-
query,tblinfo[i].relname,tgfunc);
1600+
sprintf(query,"%s ON%s FOR EACH ROW EXECUTE PROCEDURE %s (",
1601+
query,fmtId(tblinfo[i].relname),tgfunc);
16021602
for (findx=0;findx<tgnargs;findx++)
16031603
{
16041604
char*s,
@@ -1967,10 +1967,10 @@ dumpTypes(FILE *fout, FuncInfo *finfo, int numFuncs,
19671967
becomeUser(fout,tinfo[i].usename);
19681968

19691969
sprintf(q,
1970-
"CREATE TYPE\"%s\" "
1970+
"CREATE TYPE%s "
19711971
"( internallength = %s, externallength = %s, input = %s, "
19721972
"output = %s, send = %s, receive = %s, default = '%s'",
1973-
tinfo[i].typname,
1973+
fmtId(tinfo[i].typname),
19741974
tinfo[i].typlen,
19751975
tinfo[i].typprtlen,
19761976
tinfo[i].typinput,
@@ -2033,13 +2033,13 @@ dumpOneFunc(FILE *fout, FuncInfo *finfo, int i,
20332033

20342034
becomeUser(fout,finfo[i].usename);
20352035

2036-
sprintf(q,"CREATE FUNCTION\"%s\" (",finfo[i].proname);
2036+
sprintf(q,"CREATE FUNCTION%s (",fmtId(finfo[i].proname));
20372037
for (j=0;j<finfo[i].nargs;j++)
20382038
{
20392039
char*typname;
20402040

20412041
typname=findTypeByOid(tinfo,numTypes,finfo[i].argtypes[j]);
2042-
sprintf(q,"%s%s\"%s\"",
2042+
sprintf(q,"%s%s%s",
20432043
q,
20442044
(j>0) ?"," :"",
20452045
fmtId(typname));
@@ -2400,22 +2400,22 @@ dumpACL(FILE *fout, TableInfo tbinfo)
24002400

24012401
/* Revoke Default permissions for PUBLIC */
24022402
fprintf(fout,
2403-
"REVOKE ALL on\"%s\" from PUBLIC;\n",
2404-
tbinfo.relname);
2403+
"REVOKE ALL on%s from PUBLIC;\n",
2404+
fmtId(tbinfo.relname));
24052405

24062406
for (k=0;k<l;k++)
24072407
{
24082408
if (ACLlist[k].privledges!= (char*)NULL)
24092409
{
24102410
if (ACLlist[k].user== (char*)NULL)
24112411
fprintf(fout,
2412-
"GRANT %s on\"%s\" to PUBLIC;\n",
2413-
ACLlist[k].privledges,tbinfo.relname);
2412+
"GRANT %s on%s to PUBLIC;\n",
2413+
ACLlist[k].privledges,fmtId(tbinfo.relname));
24142414
else
24152415
fprintf(fout,
2416-
"GRANT %s on\"%s\" to\"%s\";\n",
2417-
ACLlist[k].privledges,tbinfo.relname,
2418-
ACLlist[k].user);
2416+
"GRANT %s on%s to%s;\n",
2417+
ACLlist[k].privledges,fmtId(tbinfo.relname),
2418+
fmtId(ACLlist[k].user));
24192419
}
24202420
}
24212421
}
@@ -2471,7 +2471,7 @@ dumpTables(FILE *fout, TableInfo *tblinfo, int numTables,
24712471

24722472
becomeUser(fout,tblinfo[i].usename);
24732473

2474-
sprintf(q,"CREATE TABLE\"%s\" (",fmtId(tblinfo[i].relname));
2474+
sprintf(q,"CREATE TABLE%s (",fmtId(tblinfo[i].relname));
24752475
actual_atts=0;
24762476
for (j=0;j<tblinfo[i].numatts;j++)
24772477
{
@@ -2481,7 +2481,7 @@ dumpTables(FILE *fout, TableInfo *tblinfo, int numTables,
24812481
/* Show lengths on bpchar and varchar */
24822482
if (!strcmp(tblinfo[i].typnames[j],"bpchar"))
24832483
{
2484-
sprintf(q,"%s%s\"%s\" char",
2484+
sprintf(q,"%s%s%s char",
24852485
q,
24862486
(actual_atts>0) ?", " :"",
24872487
fmtId(tblinfo[i].attnames[j]));
@@ -2493,7 +2493,7 @@ dumpTables(FILE *fout, TableInfo *tblinfo, int numTables,
24932493
}
24942494
elseif (!strcmp(tblinfo[i].typnames[j],"varchar"))
24952495
{
2496-
sprintf(q,"%s%s\"%s\" %s",
2496+
sprintf(q,"%s%s%s %s",
24972497
q,
24982498
(actual_atts>0) ?", " :"",
24992499
fmtId(tblinfo[i].attnames[j]),
@@ -2506,7 +2506,7 @@ dumpTables(FILE *fout, TableInfo *tblinfo, int numTables,
25062506
}
25072507
else
25082508
{
2509-
sprintf(q,"%s%s\"%s\" %s",
2509+
sprintf(q,"%s%s%s %s",
25102510
q,
25112511
(actual_atts>0) ?", " :"",
25122512
fmtId(tblinfo[i].attnames[j]),
@@ -2539,7 +2539,7 @@ dumpTables(FILE *fout, TableInfo *tblinfo, int numTables,
25392539
sprintf(q,"%s%s%s",
25402540
q,
25412541
(k>0) ?", " :"",
2542-
parentRels[k]);
2542+
fmtId(parentRels[k]));
25432543
}
25442544
strcat(q,")");
25452545
}
@@ -2648,7 +2648,7 @@ dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices,
26482648
else
26492649
attname=tblinfo[tableInd].attnames[indkey];
26502650
if (funcname)
2651-
sprintf(attlist+strlen(attlist),"%s\"%s\"",
2651+
sprintf(attlist+strlen(attlist),"%s%s",
26522652
(k==0) ?"" :", ",fmtId(attname));
26532653
else
26542654
{
@@ -2659,7 +2659,7 @@ dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices,
26592659
attname,indinfo[i].indexrelname);
26602660
exit_nicely(g_conn);
26612661
}
2662-
sprintf(attlist+strlen(attlist),"%s\"%s\" \"%s\"",
2662+
sprintf(attlist+strlen(attlist),"%s%s %s",
26632663
(k==0) ?"" :", ",fmtId(attname),fmtId(classname[k]));
26642664
free(classname[k]);
26652665
}
@@ -2668,14 +2668,14 @@ dumpIndices(FILE *fout, IndInfo *indinfo, int numIndices,
26682668
if (!tablename|| (!strcmp(indinfo[i].indrelname,tablename)))
26692669
{
26702670

2671-
sprintf(q,"CREATE %s INDEX\"%s\" on\"%s\" using %s (",
2671+
sprintf(q,"CREATE %s INDEX%s on%s using %s (",
26722672
(strcmp(indinfo[i].indisunique,"t")==0) ?"UNIQUE" :"",
26732673
fmtId(indinfo[i].indexrelname),
26742674
fmtId(indinfo[i].indrelname),
26752675
indinfo[i].indamname);
26762676
if (funcname)
26772677
{
2678-
sprintf(q,"%s %s (%s)\"%s\" );\n",
2678+
sprintf(q,"%s %s (%s)%s );\n",
26792679
q,funcname,attlist,fmtId(classname[0]));
26802680
free(funcname);
26812681
free(classname[0]);
@@ -2892,7 +2892,7 @@ dumpSequence(FILE *fout, TableInfo tbinfo)
28922892

28932893
sprintf(query,
28942894
"SELECT sequence_name, last_value, increment_by, max_value, "
2895-
"min_value, cache_value, is_cycled, is_called from\"%s\"",
2895+
"min_value, cache_value, is_cycled, is_called from%s",
28962896
fmtId(tbinfo.relname));
28972897

28982898
res=PQexec(g_conn,query);
@@ -2931,7 +2931,7 @@ dumpSequence(FILE *fout, TableInfo tbinfo)
29312931
PQclear(res);
29322932

29332933
sprintf(query,
2934-
"CREATE SEQUENCE\"%s\" start %d increment %d maxvalue %d "
2934+
"CREATE SEQUENCE%s start %d increment %d maxvalue %d "
29352935
"minvalue %d cache %d %s;\n",
29362936
fmtId(tbinfo.relname),last,incby,maxv,minv,cache,
29372937
(cycled=='t') ?"cycle" :"");

0 commit comments

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