Add removal of PG_VERSION to optional old cluster deletion script.

Backpatch to 9.0.X.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 5b26be3605b148e070e6403eec67a5eda78d3cbc..94c89cba0f808c3aa4360052b1ecf20c8eddec02 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -416,6 +416,11 @@ create_script_for_old_cluster_deletion(migratorContext *ctx,
                        int                     dbnum;
 
                        fprintf(script, "\n");
+                       /* remove PG_VERSION? */
+                       if (GET_MAJOR_VERSION(ctx->old.major_version) <= 804)
+                               fprintf(script, RM_CMD " %s%s/PG_VERSION\n",
+                                               ctx->tablespaces[tblnum], ctx->old.tablespace_suffix);
+
                        for (dbnum = 0; dbnum < ctx->new.dbarr.ndbs; dbnum++)
                        {
                                fprintf(script, RMDIR_CMD " %s%s/%d\n",

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 3f8fb0ccf9d038f69208b7c40e4533102ddc9a44..5cc7d1f536c5c09f8edd5b16662cf176303739c7 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -38,6 +38,7 @@
 #define pg_copy_file           copy_file
 #define pg_mv_file                     rename
 #define pg_link_file           link
+#define RM_CMD                         "rm -f"
 #define RMDIR_CMD                      "rm -rf"
 #define SHELL_EXT                      "sh"
 #else
@@ -45,6 +46,7 @@
 #define pg_mv_file                     pgrename
 #define pg_link_file           win32_pghardlink
 #define sleep(x)                       Sleep(x * 1000)
+#define RM_CMD                         "DEL /q"
 #define RMDIR_CMD                      "RMDIR /s/q"
 #define SHELL_EXT                      "bat"
 #define EXE_EXT                                ".exe"