diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2012-09-04 05:49:22 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2012-09-04 05:49:22 -0400 |
| commit | 0829c7087e170a49d2cd3a15621c5c50fb5897fc (patch) | |
| tree | c81c70601cd3419c83001c28b6acf8c90b8059ae | |
| parent | bd46b5219940be1801720fc7e760e4b4bcaef286 (diff) | |
| download | postgresql-0829c7087e170a49d2cd3a15621c5c50fb5897fc.tar.gz postgresql-0829c7087e170a49d2cd3a15621c5c50fb5897fc.zip | |
Fix command echoing in pg_upgade's analyze script for Windows.
| -rw-r--r-- | contrib/pg_upgrade/check.c | 17 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 2 |
2 files changed, 12 insertions, 7 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index f2dcc0483da..8ebe61400f8 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -450,6 +450,9 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) #ifndef WIN32 /* add shebang header */ fprintf(script, "#!/bin/sh\n\n"); +#else + /* suppress command echoing */ + fprintf(script, "@echo off"); #endif fprintf(script, "echo %sThis script will generate minimal optimizer statistics rapidly%s\n", @@ -460,7 +463,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) ECHO_QUOTE, ECHO_QUOTE); fprintf(script, "echo %shave the default level of optimizer statistics.%s\n", ECHO_QUOTE, ECHO_QUOTE); - fprintf(script, "echo\n\n"); + fprintf(script, "echo%s\n\n", ECHO_BLANK); fprintf(script, "echo %sIf you have used ALTER TABLE to modify the statistics target for%s\n", ECHO_QUOTE, ECHO_QUOTE); @@ -468,7 +471,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) ECHO_QUOTE, ECHO_QUOTE); fprintf(script, "echo %srunning this script because they will delay fast statistics generation.%s\n", ECHO_QUOTE, ECHO_QUOTE); - fprintf(script, "echo\n\n"); + fprintf(script, "echo%s\n\n", ECHO_BLANK); fprintf(script, "echo %sIf you would like default statistics as quickly as possible, cancel%s\n", ECHO_QUOTE, ECHO_QUOTE); @@ -478,7 +481,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) /* Did we copy the free space files? */ (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ? "--analyze-only" : "--analyze", ECHO_QUOTE); - fprintf(script, "echo\n\n"); + fprintf(script, "echo%s\n\n", ECHO_BLANK); #ifndef WIN32 fprintf(script, "sleep 2\n"); @@ -496,12 +499,12 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) fprintf(script, "echo %s--------------------------------------------------%s\n", ECHO_QUOTE, ECHO_QUOTE); fprintf(script, "vacuumdb --all --analyze-only\n"); - fprintf(script, "echo\n"); + fprintf(script, "echo%s\n", ECHO_BLANK); fprintf(script, "echo %sThe server is now available with minimal optimizer statistics.%s\n", ECHO_QUOTE, ECHO_QUOTE); fprintf(script, "echo %sQuery performance will be optimal once this script completes.%s\n", ECHO_QUOTE, ECHO_QUOTE); - fprintf(script, "echo\n\n"); + fprintf(script, "echo%s\n\n", ECHO_BLANK); #ifndef WIN32 fprintf(script, "sleep 2\n"); @@ -517,7 +520,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) fprintf(script, "echo %s---------------------------------------------------%s\n", ECHO_QUOTE, ECHO_QUOTE); fprintf(script, "vacuumdb --all --analyze-only\n"); - fprintf(script, "echo\n\n"); + fprintf(script, "echo%s\n\n", ECHO_BLANK); #ifndef WIN32 fprintf(script, "unset PGOPTIONS\n"); @@ -534,7 +537,7 @@ create_script_for_cluster_analyze(char **analyze_script_file_name) (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ? "--analyze-only" : "--analyze"); - fprintf(script, "echo\n\n"); + fprintf(script, "echo%s\n\n", ECHO_BLANK); fprintf(script, "echo %sDone%s\n", ECHO_QUOTE, ECHO_QUOTE); diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index b57da53d63e..195b927cf5b 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -77,6 +77,7 @@ extern char *output_files[]; #define RMDIR_CMD "rm -rf" #define SCRIPT_EXT "sh" #define ECHO_QUOTE "'" +#define ECHO_BLANK "" #else #define pg_copy_file CopyFile #define pg_mv_file pgrename @@ -88,6 +89,7 @@ extern char *output_files[]; #define SCRIPT_EXT "bat" #define EXE_EXT ".exe" #define ECHO_QUOTE "" +#define ECHO_BLANK "." #endif #define CLUSTER_NAME(cluster) ((cluster) == &old_cluster ? "old" : \ |