PGPRO-1205: Show PostgreSQL version via --version argument

za-arthur · za-arthur · commit 3fcdae09bd74 · 2017-12-06T19:00:00.000+03:00
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
@@ -224,7 +224,14 @@ main(int argc, char *argv[])
 		{
 			if (argc == 2)
 			{
-				fprintf(stderr, "%s %s\n", PROGRAM_NAME, PROGRAM_VERSION);
+#ifdef PGPRO_VERSION
+				fprintf(stderr, "%s %s (PostgresPro %s %s)\n",
+						PROGRAM_NAME, PROGRAM_VERSION,
+						PGPRO_VERSION, PGPRO_EDITION);
+#else
+				fprintf(stderr, "%s %s (PostgreSQL %s)\n",
+						PROGRAM_NAME, PROGRAM_VERSION, PG_VERSION);
+#endif
 				exit(0);
 			}
 			else if (strcmp(argv[2], "--help") == 0)

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,14 @@ main(int argc, char *argv[])`
`224`	`224`	`{`
`225`	`225`	`if (argc == 2)`
`226`	`226`	`{`
`227`		`- fprintf(stderr, "%s %s\n", PROGRAM_NAME, PROGRAM_VERSION);`
	`227`	`+#ifdef PGPRO_VERSION`
	`228`	`+ fprintf(stderr, "%s %s (PostgresPro %s %s)\n",`
	`229`	`+ PROGRAM_NAME, PROGRAM_VERSION,`
	`230`	`+ PGPRO_VERSION, PGPRO_EDITION);`
	`231`	`+#else`
	`232`	`+ fprintf(stderr, "%s %s (PostgreSQL %s)\n",`
	`233`	`+ PROGRAM_NAME, PROGRAM_VERSION, PG_VERSION);`
	`234`	`+#endif`
`228`	`235`	`exit(0);`
`229`	`236`	`}`
`230`	`237`	`else if (strcmp(argv[2], "--help") == 0)`