[GitHub] [incubator-devlake] warren830 commented on a diff in pull request #2950: fix: cached plan must not change result type

[GitBox <gi...@apache.org>]

warren830 commented on code in PR #2950:
URL: https://github.com/apache/incubator-devlake/pull/2950#discussion_r962776199


##########
plugins/jira/models/migrationscripts/20220716_add_init_tables.go:
##########
@@ -92,61 +94,79 @@ func (*addInitTables) Up(ctx context.Context, db *gorm.DB) error {
 		return err
 	}
 
-	// get connection history data
-	err = db.Migrator().CreateTable(&JiraConnectionTemp{})
+	// due to cached plan must not change result type in postgres,
+	// so need to use JiraConnectionOld, JiraConnectionNew and JiraConnection to operate.
+	// step1: create _tool_jira_connections_new table
+	// step2: rename _tool_jira_connections to _tool_jira_connections_old
+	// step3: select data from _tool_jira_connections_old and insert date to _tool_jira_connections_new
+	// step4: rename _tool_jira_connections_new to _tool_jira_connections
+
+	// step1
+	err = db.Migrator().CreateTable(&JiraConnectionNew{})
 	if err != nil {
 		return err
 	}
-	defer db.Migrator().DropTable(&JiraConnectionTemp{})
+	defer db.Migrator().DropTable(&JiraConnectionNew{})
 
+	// step2
+	err = db.Migrator().RenameTable(JiraConnectionV011, JiraConnectionV011Old{})
+	if err != nil {
+		return err
+	}
+	defer func() {
+		if err != nil {
+			err = db.Migrator().RenameTable(JiraConnectionV011Old{}, JiraConnectionV011)
+		} else {
+			err = db.Migrator().DropTable(&JiraConnectionV011Old{})
+		}
+	}()
+
+	// step3
 	var result *gorm.DB
-	var jiraConns []JiraConnectionV011
+	var jiraConns []JiraConnectionV011Old
 	result = db.Find(&jiraConns)
+	if result.Error != nil {
+		return result.Error
+	}
 
-	if result.Error == nil {
-		for _, v := range jiraConns {
-			conn := &JiraConnectionTemp{}
-			conn.ID = v.ID
-			conn.Name = v.Name
-			conn.Endpoint = v.Endpoint
-			conn.Proxy = v.Proxy
-			conn.RateLimitPerHour = v.RateLimit
-
-			c := config.GetConfig()
-			encKey := c.GetString(core.EncodeKeyEnvStr)
-			if encKey == "" {
-				return errors.BadInput.New("jira v0.11 invalid encKey", errors.AsUserMessage())
-			}
-			auth, err := core.Decrypt(encKey, v.BasicAuthEncoded)
-			if err != nil {
-				return err
-			}
-			pk, err := base64.StdEncoding.DecodeString(auth)
+	for _, v := range jiraConns {
+		conn := &JiraConnectionNew{}
+		conn.ID = v.ID
+		conn.Name = v.Name
+		conn.Endpoint = v.Endpoint
+		conn.Proxy = v.Proxy
+		conn.RateLimitPerHour = v.RateLimit
+
+		c := config.GetConfig()
+		encKey := c.GetString(core.EncodeKeyEnvStr)
+		if encKey == "" {
+			return errors.BadInput.New("jira v0.11 invalid encKey", errors.AsUserMessage())
+		}
+		auth, err := core.Decrypt(encKey, v.BasicAuthEncoded)
+		if err != nil {
+			return err
+		}
+		pk, err := base64.StdEncoding.DecodeString(auth)
+		if err != nil {
+			return err
+		}
+		originInfo := strings.Split(string(pk), ":")
+		if len(originInfo) == 2 {
+			conn.Username = originInfo[0]
+			conn.Password, err = core.Encrypt(encKey, originInfo[1])
 			if err != nil {
 				return err
 			}
-			originInfo := strings.Split(string(pk), ":")
-			if len(originInfo) == 2 {
-				conn.Username = originInfo[0]
-				conn.Password, err = core.Encrypt(encKey, originInfo[1])
-				if err != nil {
-					return err
-				}
-				// create
-				tx := db.Create(&conn)
-				if tx.Error != nil {
-					return errors.Default.Wrap(tx.Error, "error adding connection to DB")
-				}
+			// create
+			tx := db.Create(&conn)
+			if tx.Error != nil {
+				return errors.Default.Wrap(tx.Error, "error adding connection to DB")
 			}
 		}
 	}
 
-	err = db.Migrator().DropTable(&JiraConnectionV011{})
-	if err != nil {
-		return err
-	}
-
-	err = db.Migrator().RenameTable(JiraConnectionTemp{}, archived.JiraConnection{})
+	// step4
+	err = db.Migrator().RenameTable(JiraConnectionNew{}, archived.JiraConnection{})

Review Comment:
   I think we can directly use table name instead of archived.JiraConnection{}
   Two reasons:
   1. more intuitive 
   2. gorm can do one less parse



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@devlake.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org