revert migration code

buildbuddy-io · Jan 12, 2022 · c952acd · c952acd
1 parent c6fea62
commit c952acd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/server/tables/tables.go b/server/tables/tables.go
@@ -585,22 +585,25 @@ func PreAutoMigrate(db *gorm.DB) ([]PostAutoMigrateLogic, error) {
 	}
 
 	if m.HasTable("Invocations") && m.HasColumn(&Invocation{}, "invocation_uuid") {
-		if db.Dialector.Name() == mysqlDialect {
-			err := backfillInvocationUUIDIfNull(db)
-			return postMigrate, err
-		}
+		// TODO(luluz): Disable migration code for now
+		// if db.Dialector.Name() == mysqlDialect {
+		// 		err := backfillInvocationUUIDIfNull(db)
+		//	return postMigrate, err
+		//}
 	}
 
 	// Populate invocation_uuid if the column doesn't exist.
 	if m.HasTable("Invocations") && !m.HasColumn(&Invocation{}, "invocation_uuid") {
 		if db.Dialector.Name() == sqliteDialect {
-			postMigrate = append(postMigrate, func() error {
-				return postMigrateInvocationUUIDForSQLite(db)
-			})
+			// TODO(luluz): Disable migration code for now
+			//postMigrate = append(postMigrate, func() error {
+			//	return postMigrateInvocationUUIDForSQLite(db)
+			//})
 		} else if db.Dialector.Name() == mysqlDialect {
-			postMigrate = append(postMigrate, func() error {
-				return postMigrateInvocationUUIDForMySQL(db)
-			})
+			// TODO(luluz): Disable migration code for now
+			// postMigrate = append(postMigrate, func() error {
+			// return postMigrateInvocationUUIDForMySQL(db)
+			// })
 		} else {
 			log.Warningf("Unsupported sql dialect: %q", db.Dialector.Name())
 		}

diff --git a/server/target/target.go b/server/target/target.go
@@ -81,7 +81,7 @@ func readTargets(ctx context.Context, env environment.Env, req *trpb.GetTargetRe
                                      i.invocation_id, i.commit_sha, i.branch_name, i.repo_url, i.created_at_usec
                                      FROM Targets as t
                                      JOIN TargetStatuses AS ts ON t.target_id = ts.target_id
-                                     JOIN Invocations AS i ON ts.invocation_uuid = i.invocation_uuid`)
+                                     JOIN Invocations AS i ON ts.invocation_pk = i.invocation_pk`)
 	q.AddWhereClause("i.group_id = ?", req.GetRequestContext().GetGroupId())
 	q.AddWhereClause("t.group_id = ?", req.GetRequestContext().GetGroupId())
 	// Adds user / permissions to targets (t) table.