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

Commit17676c7

Browse files
committed
Make oid2name, pgbench, and vacuumlo set fallback_application_name.
Amit Kapila, reviewed by Shigeru Hanada and Peter Eisentraut,with some modifications by me.
1 parent10e0dd8 commit17676c7

File tree

3 files changed

+72
-23
lines changed

3 files changed

+72
-23
lines changed

‎contrib/oid2name/oid2name.c

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ struct options
4444
char*hostname;
4545
char*port;
4646
char*username;
47+
constchar*progname;
4748
};
4849

4950
/* function prototypes */
@@ -80,6 +81,7 @@ get_opts(int argc, char **argv, struct options * my_opts)
8081
my_opts->hostname=NULL;
8182
my_opts->port=NULL;
8283
my_opts->username=NULL;
84+
my_opts->progname=progname;
8385

8486
if (argc>1)
8587
{
@@ -308,14 +310,29 @@ sql_conn(struct options * my_opts)
308310
*/
309311
do
310312
{
313+
#definePARAMS_ARRAY_SIZE7
314+
315+
constchar*keywords[PARAMS_ARRAY_SIZE];
316+
constchar*values[PARAMS_ARRAY_SIZE];
317+
318+
keywords[0]="host";
319+
values[0]=my_opts->hostname;
320+
keywords[1]="port";
321+
values[1]=my_opts->port;
322+
keywords[2]="user";
323+
values[2]=my_opts->username;
324+
keywords[3]="password";
325+
values[3]=password;
326+
keywords[4]="dbname";
327+
values[4]=my_opts->dbname;
328+
keywords[5]="fallback_application_name";
329+
values[5]=my_opts->progname;
330+
keywords[6]=NULL;
331+
values[6]=NULL;
332+
311333
new_pass= false;
312-
conn=PQsetdbLogin(my_opts->hostname,
313-
my_opts->port,
314-
NULL,/* options */
315-
NULL,/* tty */
316-
my_opts->dbname,
317-
my_opts->username,
318-
password);
334+
conn=PQconnectdbParams(keywords,values, true);
335+
319336
if (!conn)
320337
{
321338
fprintf(stderr,"%s: could not connect to database %s\n",

‎contrib/pgbench/pgbench.c

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,9 @@ intmain_pid;/* main process id used in log filename */
151151

152152
char*pghost="";
153153
char*pgport="";
154-
char*pgoptions=NULL;
155-
char*pgtty=NULL;
156154
char*login=NULL;
157155
char*dbName;
156+
constchar*progname;
158157

159158
volatilebooltimer_exceeded= false;/* flag from signal handler */
160159

@@ -339,7 +338,7 @@ xstrdup(const char *s)
339338

340339

341340
staticvoid
342-
usage(constchar*progname)
341+
usage(void)
343342
{
344343
printf("%s is a benchmarking tool for PostgreSQL.\n\n"
345344
"Usage:\n"
@@ -431,10 +430,30 @@ doConnect(void)
431430
*/
432431
do
433432
{
433+
#definePARAMS_ARRAY_SIZE7
434+
435+
constchar*keywords[PARAMS_ARRAY_SIZE];
436+
constchar*values[PARAMS_ARRAY_SIZE];
437+
438+
keywords[0]="host";
439+
values[0]=pghost;
440+
keywords[1]="port";
441+
values[1]=pgport;
442+
keywords[2]="user";
443+
values[2]=login;
444+
keywords[3]="password";
445+
values[3]=password;
446+
keywords[4]="dbname";
447+
values[4]=dbName;
448+
keywords[5]="fallback_application_name";
449+
values[5]=progname;
450+
keywords[6]=NULL;
451+
values[6]=NULL;
452+
434453
new_pass= false;
435454

436-
conn=PQsetdbLogin(pghost,pgport,pgoptions,pgtty,dbName,
437-
login,password);
455+
conn=PQconnectdbParams(keywords,values, true);
456+
438457
if (!conn)
439458
{
440459
fprintf(stderr,"Connection to database \"%s\" failed\n",
@@ -1907,15 +1926,13 @@ main(int argc, char **argv)
19071926

19081927
charval[64];
19091928

1910-
constchar*progname;
1911-
19121929
progname=get_progname(argv[0]);
19131930

19141931
if (argc>1)
19151932
{
19161933
if (strcmp(argv[1],"--help")==0||strcmp(argv[1],"-?")==0)
19171934
{
1918-
usage(progname);
1935+
usage();
19191936
exit(0);
19201937
}
19211938
if (strcmp(argv[1],"--version")==0||strcmp(argv[1],"-V")==0)

‎contrib/vacuumlo/vacuumlo.c

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ struct _param
4444
enumtrivaluepg_prompt;
4545
char*pg_port;
4646
char*pg_host;
47+
constchar*progname;
4748
intverbose;
4849
intdry_run;
4950
longtransaction_limit;
@@ -81,15 +82,28 @@ vacuumlo(const char *database, const struct _param * param)
8182
*/
8283
do
8384
{
84-
new_pass= false;
85+
#definePARAMS_ARRAY_SIZE 7
86+
87+
constchar*keywords[PARAMS_ARRAY_SIZE];
88+
constchar*values[PARAMS_ARRAY_SIZE];
89+
90+
keywords[0]="host";
91+
values[0]=param->pg_host;
92+
keywords[1]="port";
93+
values[1]=param->pg_port;
94+
keywords[2]="user";
95+
values[2]=param->pg_user;
96+
keywords[3]="password";
97+
values[3]=password;
98+
keywords[4]="dbname";
99+
values[4]=database;
100+
keywords[5]="fallback_application_name";
101+
values[5]=param->progname;
102+
keywords[6]=NULL;
103+
values[6]=NULL;
85104

86-
conn=PQsetdbLogin(param->pg_host,
87-
param->pg_port,
88-
NULL,
89-
NULL,
90-
database,
91-
param->pg_user,
92-
password);
105+
new_pass= false;
106+
conn=PQconnectdbParams(keywords,values, true);
93107
if (!conn)
94108
{
95109
fprintf(stderr,"Connection to database \"%s\" failed\n",
@@ -416,6 +430,7 @@ main(int argc, char **argv)
416430
param.pg_prompt=TRI_DEFAULT;
417431
param.pg_host=NULL;
418432
param.pg_port=NULL;
433+
param.progname=progname;
419434
param.verbose=0;
420435
param.dry_run=0;
421436
param.transaction_limit=1000;

0 commit comments

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