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

Commit0c22327

Browse files
committed
Remove useless trailing spaces in queries in C strings
Author: Alexander Law <exclusion@gmail.com>
1 parent674677c commit0c22327

File tree

4 files changed

+85
-85
lines changed

4 files changed

+85
-85
lines changed

‎contrib/oid2name/oid2name.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -506,20 +506,20 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
506506
/* now build the query */
507507
todo=psprintf(
508508
"SELECT pg_catalog.pg_relation_filenode(c.oid) as \"Filenode\", relname as \"Table Name\" %s\n"
509-
"FROM pg_catalog.pg_class c\n"
510-
"LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n"
509+
"FROM pg_catalog.pg_class c\n"
510+
"LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n"
511511
"LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),\n"
512-
"pg_catalog.pg_tablespace t\n"
512+
"pg_catalog.pg_tablespace t\n"
513513
"WHERE relkind IN ("CppAsString2(RELKIND_RELATION) ","
514514
CppAsString2(RELKIND_MATVIEW)","
515515
CppAsString2(RELKIND_INDEX)","
516516
CppAsString2(RELKIND_SEQUENCE)","
517-
CppAsString2(RELKIND_TOASTVALUE)") AND\n"
517+
CppAsString2(RELKIND_TOASTVALUE)") AND\n"
518518
"t.oid = CASE\n"
519519
"WHEN reltablespace <> 0 THEN reltablespace\n"
520520
"ELSE dattablespace\n"
521-
"END AND\n"
522-
" (%s)\n"
521+
"END AND\n"
522+
" (%s)\n"
523523
"ORDER BY relname\n",
524524
opts->extended ?addfields :"",
525525
qualifiers);

‎src/bin/pg_dump/pg_dump.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13984,12 +13984,12 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
1398413984

1398513985
resetPQExpBuffer(query);
1398613986
appendPQExpBuffer(query,
13987-
"SELECT\n"
13988-
" ( SELECT alias FROM pg_catalog.ts_token_type('%u'::pg_catalog.oid) AS t\n"
13989-
" WHERE t.tokid = m.maptokentype ) AS tokenname,\n"
13990-
" m.mapdict::pg_catalog.regdictionary AS dictname\n"
13991-
"FROM pg_catalog.pg_ts_config_map AS m\n"
13992-
"WHERE m.mapcfg = '%u'\n"
13987+
"SELECT\n"
13988+
" ( SELECT alias FROM pg_catalog.ts_token_type('%u'::pg_catalog.oid) AS t\n"
13989+
" WHERE t.tokid = m.maptokentype ) AS tokenname,\n"
13990+
" m.mapdict::pg_catalog.regdictionary AS dictname\n"
13991+
"FROM pg_catalog.pg_ts_config_map AS m\n"
13992+
"WHERE m.mapcfg = '%u'\n"
1399313993
"ORDER BY m.mapcfg, m.maptokentype, m.mapseqno",
1399413994
cfginfo->cfgparser, cfginfo->dobj.catId.oid);
1399513995

‎src/bin/pg_rewind/libpq_fetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ libpq_executeFileMap(filemap_t *map)
489489
* temporary table. Now, actually fetch all of those ranges.
490490
*/
491491
sql=
492-
"SELECT path, begin,\n"
492+
"SELECT path, begin,\n"
493493
" pg_read_binary_file(path, begin, len, true) AS chunk\n"
494494
"FROM fetchchunks\n";
495495

‎src/bin/psql/describe.c

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
375375
" END ||\n"
376376
" CASE\n"
377377
" WHEN COALESCE(p.proargnames[s.i], '') = '' THEN ''\n"
378-
" ELSE p.proargnames[s.i] || ' '\n"
378+
" ELSE p.proargnames[s.i] || ' '\n"
379379
" END ||\n"
380380
" pg_catalog.format_type(p.proallargtypes[s.i], NULL)\n"
381381
" FROM\n"
@@ -898,7 +898,7 @@ permissionsList(const char *pattern)
898898
" SELECT polname\n"
899899
" || CASE WHEN polcmd != '*' THEN\n"
900900
" E' (' || polcmd || E'):'\n"
901-
" ELSE E':'\n"
901+
" ELSE E':'\n"
902902
" END\n"
903903
" || CASE WHEN polqual IS NOT NULL THEN\n"
904904
" E'\\n (u): ' || pg_catalog.pg_get_expr(polqual, polrelid)\n"
@@ -932,7 +932,7 @@ permissionsList(const char *pattern)
932932
" ELSE '' END\n"
933933
" || CASE WHEN polcmd != '*' THEN\n"
934934
" E' (' || polcmd || E'):'\n"
935-
" ELSE E':'\n"
935+
" ELSE E':'\n"
936936
" END\n"
937937
" || CASE WHEN polqual IS NOT NULL THEN\n"
938938
" E'\\n (u): ' || pg_catalog.pg_get_expr(polqual, polrelid)\n"
@@ -2255,7 +2255,7 @@ describeOneTableDetails(const char *schemaname,
22552255
"CASE WHEN pol.polroles = '{0}' THEN NULL ELSE array_to_string(array(select rolname from pg_roles where oid = any (pol.polroles) order by 1),',') END,\n"
22562256
"pg_catalog.pg_get_expr(pol.polqual, pol.polrelid),\n"
22572257
"pg_catalog.pg_get_expr(pol.polwithcheck, pol.polrelid),\n"
2258-
"CASE pol.polcmd\n"
2258+
"CASE pol.polcmd\n"
22592259
"WHEN 'r' THEN 'SELECT'\n"
22602260
"WHEN 'a' THEN 'INSERT'\n"
22612261
"WHEN 'w' THEN 'UPDATE'\n"
@@ -2270,7 +2270,7 @@ describeOneTableDetails(const char *schemaname,
22702270
"CASE WHEN pol.polroles = '{0}' THEN NULL ELSE array_to_string(array(select rolname from pg_roles where oid = any (pol.polroles) order by 1),',') END,\n"
22712271
"pg_catalog.pg_get_expr(pol.polqual, pol.polrelid),\n"
22722272
"pg_catalog.pg_get_expr(pol.polwithcheck, pol.polrelid),\n"
2273-
"CASE pol.polcmd\n"
2273+
"CASE pol.polcmd\n"
22742274
"WHEN 'r' THEN 'SELECT'\n"
22752275
"WHEN 'a' THEN 'INSERT'\n"
22762276
"WHEN 'w' THEN 'UPDATE'\n"
@@ -3975,11 +3975,11 @@ listTSParsers(const char *pattern, bool verbose)
39753975
initPQExpBuffer(&buf);
39763976

39773977
printfPQExpBuffer(&buf,
3978-
"SELECT\n"
3978+
"SELECT\n"
39793979
" n.nspname as \"%s\",\n"
39803980
" p.prsname as \"%s\",\n"
39813981
" pg_catalog.obj_description(p.oid, 'pg_ts_parser') as \"%s\"\n"
3982-
"FROM pg_catalog.pg_ts_parser p\n"
3982+
"FROM pg_catalog.pg_ts_parser p\n"
39833983
"LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.prsnamespace\n",
39843984
gettext_noop("Schema"),
39853985
gettext_noop("Name"),
@@ -4020,9 +4020,9 @@ listTSParsersVerbose(const char *pattern)
40204020
initPQExpBuffer(&buf);
40214021

40224022
printfPQExpBuffer(&buf,
4023-
"SELECT p.oid,\n"
4024-
" n.nspname,\n"
4025-
" p.prsname\n"
4023+
"SELECT p.oid,\n"
4024+
" n.nspname,\n"
4025+
" p.prsname\n"
40264026
"FROM pg_catalog.pg_ts_parser p\n"
40274027
"LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.prsnamespace\n"
40284028
);
@@ -4087,34 +4087,34 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
40874087
initPQExpBuffer(&buf);
40884088

40894089
printfPQExpBuffer(&buf,
4090-
"SELECT '%s' AS \"%s\",\n"
4091-
" p.prsstart::pg_catalog.regproc AS \"%s\",\n"
4092-
" pg_catalog.obj_description(p.prsstart, 'pg_proc') as \"%s\"\n"
4093-
" FROM pg_catalog.pg_ts_parser p\n"
4094-
" WHERE p.oid = '%s'\n"
4095-
"UNION ALL\n"
4096-
"SELECT '%s',\n"
4097-
" p.prstoken::pg_catalog.regproc,\n"
4098-
" pg_catalog.obj_description(p.prstoken, 'pg_proc')\n"
4099-
" FROM pg_catalog.pg_ts_parser p\n"
4100-
" WHERE p.oid = '%s'\n"
4101-
"UNION ALL\n"
4102-
"SELECT '%s',\n"
4103-
" p.prsend::pg_catalog.regproc,\n"
4104-
" pg_catalog.obj_description(p.prsend, 'pg_proc')\n"
4105-
" FROM pg_catalog.pg_ts_parser p\n"
4106-
" WHERE p.oid = '%s'\n"
4107-
"UNION ALL\n"
4108-
"SELECT '%s',\n"
4109-
" p.prsheadline::pg_catalog.regproc,\n"
4110-
" pg_catalog.obj_description(p.prsheadline, 'pg_proc')\n"
4111-
" FROM pg_catalog.pg_ts_parser p\n"
4112-
" WHERE p.oid = '%s'\n"
4113-
"UNION ALL\n"
4114-
"SELECT '%s',\n"
4115-
" p.prslextype::pg_catalog.regproc,\n"
4116-
" pg_catalog.obj_description(p.prslextype, 'pg_proc')\n"
4117-
" FROM pg_catalog.pg_ts_parser p\n"
4090+
"SELECT '%s' AS \"%s\",\n"
4091+
" p.prsstart::pg_catalog.regproc AS \"%s\",\n"
4092+
" pg_catalog.obj_description(p.prsstart, 'pg_proc') as \"%s\"\n"
4093+
" FROM pg_catalog.pg_ts_parser p\n"
4094+
" WHERE p.oid = '%s'\n"
4095+
"UNION ALL\n"
4096+
"SELECT '%s',\n"
4097+
" p.prstoken::pg_catalog.regproc,\n"
4098+
" pg_catalog.obj_description(p.prstoken, 'pg_proc')\n"
4099+
" FROM pg_catalog.pg_ts_parser p\n"
4100+
" WHERE p.oid = '%s'\n"
4101+
"UNION ALL\n"
4102+
"SELECT '%s',\n"
4103+
" p.prsend::pg_catalog.regproc,\n"
4104+
" pg_catalog.obj_description(p.prsend, 'pg_proc')\n"
4105+
" FROM pg_catalog.pg_ts_parser p\n"
4106+
" WHERE p.oid = '%s'\n"
4107+
"UNION ALL\n"
4108+
"SELECT '%s',\n"
4109+
" p.prsheadline::pg_catalog.regproc,\n"
4110+
" pg_catalog.obj_description(p.prsheadline, 'pg_proc')\n"
4111+
" FROM pg_catalog.pg_ts_parser p\n"
4112+
" WHERE p.oid = '%s'\n"
4113+
"UNION ALL\n"
4114+
"SELECT '%s',\n"
4115+
" p.prslextype::pg_catalog.regproc,\n"
4116+
" pg_catalog.obj_description(p.prslextype, 'pg_proc')\n"
4117+
" FROM pg_catalog.pg_ts_parser p\n"
41184118
" WHERE p.oid = '%s';",
41194119
gettext_noop("Start parse"),
41204120
gettext_noop("Method"),
@@ -4154,9 +4154,9 @@ describeOneTSParser(const char *oid, const char *nspname, const char *prsname)
41544154
initPQExpBuffer(&buf);
41554155

41564156
printfPQExpBuffer(&buf,
4157-
"SELECT t.alias as \"%s\",\n"
4158-
" t.description as \"%s\"\n"
4159-
"FROM pg_catalog.ts_token_type( '%s'::pg_catalog.oid ) as t\n"
4157+
"SELECT t.alias as \"%s\",\n"
4158+
" t.description as \"%s\"\n"
4159+
"FROM pg_catalog.ts_token_type( '%s'::pg_catalog.oid ) as t\n"
41604160
"ORDER BY 1;",
41614161
gettext_noop("Token name"),
41624162
gettext_noop("Description"),
@@ -4210,7 +4210,7 @@ listTSDictionaries(const char *pattern, bool verbose)
42104210
initPQExpBuffer(&buf);
42114211

42124212
printfPQExpBuffer(&buf,
4213-
"SELECT\n"
4213+
"SELECT\n"
42144214
" n.nspname as \"%s\",\n"
42154215
" d.dictname as \"%s\",\n",
42164216
gettext_noop("Schema"),
@@ -4219,11 +4219,11 @@ listTSDictionaries(const char *pattern, bool verbose)
42194219
if (verbose)
42204220
{
42214221
appendPQExpBuffer(&buf,
4222-
" ( SELECT COALESCE(nt.nspname, '(null)')::pg_catalog.text || '.' || t.tmplname FROM\n"
4223-
" pg_catalog.pg_ts_template t\n"
4224-
" LEFT JOIN pg_catalog.pg_namespace nt ON nt.oid = t.tmplnamespace\n"
4225-
" WHERE d.dicttemplate = t.oid ) AS \"%s\",\n"
4226-
" d.dictinitoption as \"%s\",\n",
4222+
" ( SELECT COALESCE(nt.nspname, '(null)')::pg_catalog.text || '.' || t.tmplname FROM\n"
4223+
" pg_catalog.pg_ts_template t\n"
4224+
" LEFT JOIN pg_catalog.pg_namespace nt ON nt.oid = t.tmplnamespace\n"
4225+
" WHERE d.dicttemplate = t.oid ) AS \"%s\",\n"
4226+
" d.dictinitoption as \"%s\",\n",
42274227
gettext_noop("Template"),
42284228
gettext_noop("Init options"));
42294229
}
@@ -4282,7 +4282,7 @@ listTSTemplates(const char *pattern, bool verbose)
42824282

42834283
if (verbose)
42844284
printfPQExpBuffer(&buf,
4285-
"SELECT\n"
4285+
"SELECT\n"
42864286
" n.nspname AS \"%s\",\n"
42874287
" t.tmplname AS \"%s\",\n"
42884288
" t.tmplinit::pg_catalog.regproc AS \"%s\",\n"
@@ -4295,7 +4295,7 @@ listTSTemplates(const char *pattern, bool verbose)
42954295
gettext_noop("Description"));
42964296
else
42974297
printfPQExpBuffer(&buf,
4298-
"SELECT\n"
4298+
"SELECT\n"
42994299
" n.nspname AS \"%s\",\n"
43004300
" t.tmplname AS \"%s\",\n"
43014301
" pg_catalog.obj_description(t.oid, 'pg_ts_template') AS \"%s\"\n",
@@ -4355,12 +4355,12 @@ listTSConfigs(const char *pattern, bool verbose)
43554355
initPQExpBuffer(&buf);
43564356

43574357
printfPQExpBuffer(&buf,
4358-
"SELECT\n"
4358+
"SELECT\n"
43594359
" n.nspname as \"%s\",\n"
43604360
" c.cfgname as \"%s\",\n"
43614361
" pg_catalog.obj_description(c.oid, 'pg_ts_config') as \"%s\"\n"
43624362
"FROM pg_catalog.pg_ts_config c\n"
4363-
"LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.cfgnamespace\n",
4363+
"LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.cfgnamespace\n",
43644364
gettext_noop("Schema"),
43654365
gettext_noop("Name"),
43664366
gettext_noop("Description")
@@ -4398,13 +4398,13 @@ listTSConfigsVerbose(const char *pattern)
43984398

43994399
printfPQExpBuffer(&buf,
44004400
"SELECT c.oid, c.cfgname,\n"
4401-
" n.nspname,\n"
4402-
" p.prsname,\n"
4403-
" np.nspname as pnspname\n"
4404-
"FROM pg_catalog.pg_ts_config c\n"
4405-
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.cfgnamespace,\n"
4406-
" pg_catalog.pg_ts_parser p\n"
4407-
" LEFT JOIN pg_catalog.pg_namespace np ON np.oid = p.prsnamespace\n"
4401+
" n.nspname,\n"
4402+
" p.prsname,\n"
4403+
" np.nspname as pnspname\n"
4404+
"FROM pg_catalog.pg_ts_config c\n"
4405+
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.cfgnamespace,\n"
4406+
" pg_catalog.pg_ts_parser p\n"
4407+
" LEFT JOIN pg_catalog.pg_namespace np ON np.oid = p.prsnamespace\n"
44084408
"WHERE p.oid = c.cfgparser\n"
44094409
);
44104410

@@ -4473,20 +4473,20 @@ describeOneTSConfig(const char *oid, const char *nspname, const char *cfgname,
44734473
initPQExpBuffer(&buf);
44744474

44754475
printfPQExpBuffer(&buf,
4476-
"SELECT\n"
4477-
" ( SELECT t.alias FROM\n"
4478-
" pg_catalog.ts_token_type(c.cfgparser) AS t\n"
4479-
" WHERE t.tokid = m.maptokentype ) AS \"%s\",\n"
4480-
" pg_catalog.btrim(\n"
4481-
" ARRAY( SELECT mm.mapdict::pg_catalog.regdictionary\n"
4482-
" FROM pg_catalog.pg_ts_config_map AS mm\n"
4483-
" WHERE mm.mapcfg = m.mapcfg AND mm.maptokentype = m.maptokentype\n"
4484-
" ORDER BY mapcfg, maptokentype, mapseqno\n"
4485-
" ) :: pg_catalog.text ,\n"
4486-
" '{}') AS \"%s\"\n"
4487-
"FROM pg_catalog.pg_ts_config AS c, pg_catalog.pg_ts_config_map AS m\n"
4488-
"WHERE c.oid = '%s' AND m.mapcfg = c.oid\n"
4489-
"GROUP BY m.mapcfg, m.maptokentype, c.cfgparser\n"
4476+
"SELECT\n"
4477+
" ( SELECT t.alias FROM\n"
4478+
" pg_catalog.ts_token_type(c.cfgparser) AS t\n"
4479+
" WHERE t.tokid = m.maptokentype ) AS \"%s\",\n"
4480+
" pg_catalog.btrim(\n"
4481+
" ARRAY( SELECT mm.mapdict::pg_catalog.regdictionary\n"
4482+
" FROM pg_catalog.pg_ts_config_map AS mm\n"
4483+
" WHERE mm.mapcfg = m.mapcfg AND mm.maptokentype = m.maptokentype\n"
4484+
" ORDER BY mapcfg, maptokentype, mapseqno\n"
4485+
" ) :: pg_catalog.text,\n"
4486+
" '{}') AS \"%s\"\n"
4487+
"FROM pg_catalog.pg_ts_config AS c, pg_catalog.pg_ts_config_map AS m\n"
4488+
"WHERE c.oid = '%s' AND m.mapcfg = c.oid\n"
4489+
"GROUP BY m.mapcfg, m.maptokentype, c.cfgparser\n"
44904490
"ORDER BY 1;",
44914491
gettext_noop("Token"),
44924492
gettext_noop("Dictionaries"),

0 commit comments

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