Update the upgrade sql to fix #6698

This commit updates the upgrade sql script to fix #6698: cannot recreate the same name replication policy after it is deleted

Signed-off-by: Wenkai Yin <yinw@vmware.com>

make/migrations/postgresql/0004_1.8.0_schema.up.sql

@@ -1,3 +1,4 @@
+/*add robot account table*/
 CREATE TABLE robot (
  id SERIAL PRIMARY KEY NOT NULL,
  name varchar(255),
@@ -10,4 +11,16 @@ CREATE TABLE robot (
  CONSTRAINT unique_robot UNIQUE (name, project_id)
 );
 
-CREATE TRIGGER robot_update_time_at_modtime BEFORE UPDATE ON robot FOR EACH ROW EXECUTE PROCEDURE update_update_time_at_column();
+CREATE TRIGGER robot_update_time_at_modtime BEFORE UPDATE ON robot FOR EACH ROW EXECUTE PROCEDURE update_update_time_at_column();
+
+/*add master role*/
+INSERT INTO role (role_code, name) VALUES ('DRWS', 'master');
+
+/*delete replication jobs whose policy has been marked as "deleted"*/
+DELETE FROM replication_job AS j
+USING replication_policy AS p
+WHERE j.policy_id = p.id AND p.deleted = TRUE;
+
+/*delete replication policy which has been marked as "deleted"*/
+DELETE FROM replication_policy AS p
+WHERE p.deleted = TRUE;

make/migrations/postgresql/0005_add_master_role.up.sql

@@ -1 +0,0 @@
-INSERT INTO role (role_code, name) VALUES ('DRWS', 'master');