get rid of GetTargetTableName

Author: zacharysierakowski

go/base/context.go

@@ -571,17 +571,6 @@ func (mctx *MigrationContext) GetGhostTableName() string {
 	}
 }
 
-// GetTargetTableName generates the name of the target table. In move-tables mode
-// each table keeps its own name on the target, so there is no single target
-// table name; per-table code uses MoveTable.TargetTableName instead, and calling
-// this is a programmer error that panics to fail fast.
-func (mctx *MigrationContext) GetTargetTableName() string {
-	if mctx.IsMoveTablesMode() {
-		panic("GetTargetTableName() must not be called in move-tables mode; use MoveTable.TargetTableName")
-	}
-	return mctx.GetGhostTableName()
-}
-
 // GetTargetDatabaseName fetches the name of the target database, which defaults to the original
 // database name unless we're in move-tables mode.
 func (mctx *MigrationContext) GetTargetDatabaseName() string {

go/logic/applier.go

@@ -164,7 +164,7 @@ func (apl *Applier) compileMigrationKeyWarningRegex() (*regexp.Regexp, error) {
 	if apl.migrationContext.IsMoveTablesMode() {
 		return apl.compileMoveTablesKeyWarningRegex()
 	}
-	return compileKeyWarningRegex(apl.migrationContext.GetTargetTableName(), apl.migrationContext.UniqueKey.NameInGhostTable)
+	return compileKeyWarningRegex(apl.migrationContext.GetGhostTableName(), apl.migrationContext.UniqueKey.NameInGhostTable)
 }
 
 // compileMoveTablesKeyWarningRegex builds one duplicate-key warning regex
@@ -422,7 +422,7 @@ func (apl *Applier) prepareQueries() (err error) {
 	targetDatabaseName := apl.migrationContext.GetTargetDatabaseName()
 
 	if !apl.migrationContext.IsMoveTablesMode() {
-		targetTableName := apl.migrationContext.GetTargetTableName()
+		targetTableName := apl.migrationContext.GetGhostTableName()
 		if apl.dmlDeleteQueryBuilder, err = sql.NewDMLDeleteQueryBuilder(
 			targetDatabaseName,
 			targetTableName,

go/logic/hooks.go

@@ -288,7 +288,7 @@ func (he *HooksExecutor) applyEnvironmentVariables(extraVariables ...string) []s
 	if he.migrationContext.IsMoveTablesMode() {
 		targetTableNameEnv = strings.Join(he.migrationContext.MoveTables.TableNames, ",")
 	} else {
-		targetTableNameEnv = he.migrationContext.GetTargetTableName()
+		targetTableNameEnv = he.migrationContext.GetGhostTableName()
 	}
 	env = append(env, fmt.Sprintf("GH_OST_TARGET_TABLE_NAME=%s", targetTableNameEnv))
 	env = append(env, extraVariables...)

go/logic/migrator.go

@@ -2078,11 +2078,11 @@ func (mgtr *Migrator) printMigrationStatusHint(writers ...io.Writer) {
 			mgtr.migrationContext.StartTime.Format(time.RubyDate),
 		)
 	} else {
-		fmt.Fprintf(w, "# Migrating %s.%s; Target table is %s.%s\n",
+		fmt.Fprintf(w, "# Migrating %s.%s; Ghost table is %s.%s\n",
 			sql.EscapeName(mgtr.migrationContext.DatabaseName),
 			sql.EscapeName(mgtr.migrationContext.OriginalTableName),
-			sql.EscapeName(mgtr.migrationContext.GetTargetDatabaseName()),
-			sql.EscapeName(mgtr.migrationContext.GetTargetTableName()),
+			sql.EscapeName(mgtr.migrationContext.DatabaseName),
+			sql.EscapeName(mgtr.migrationContext.GetGhostTableName()),
 		)
 		fmt.Fprintf(w, "# Migrating %+v; inspecting %+v; executing on %+v\n",
 			*mgtr.applier.connectionConfig.ImpliedKey,