Merge branch 'master' into revert-migration

meiji163 · web-flow · commit f9a27b5673dd · 2025-11-24T07:04:31.000-08:00
diff --git a/go/logic/applier.go b/go/logic/applier.go
@@ -632,7 +632,7 @@ func (this *Applier) WriteCheckpoint(chk *Checkpoint) (int64, error) {
 }
 
 func (this *Applier) ReadLastCheckpoint() (*Checkpoint, error) {
-	row := this.db.QueryRow(fmt.Sprintf(`select /* gh-ost */ * from %s.%s order by gh_ost_chk_id desc limit 1`, this.migrationContext.DatabaseName, this.migrationContext.GetCheckpointTableName()))
+	row := this.db.QueryRow(fmt.Sprintf(`select /* gh-ost */ * from %s.%s order by gh_ost_chk_id desc limit 1`, sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.GetCheckpointTableName())))
 	chk := &Checkpoint{
 		IterationRangeMin: sql.NewColumnValues(this.migrationContext.UniqueKey.Columns.Len()),
 		IterationRangeMax: sql.NewColumnValues(this.migrationContext.UniqueKey.Columns.Len()),

Original file line number	Diff line number	Diff line change
`@@ -632,7 +632,7 @@ func (this Applier) WriteCheckpoint(chk Checkpoint) (int64, error) {`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`func (this Applier) ReadLastCheckpoint() (Checkpoint, error) {`
`635`		- row := this.db.QueryRow(fmt.Sprintf(`select /* gh-ost / from %s.%s order by gh_ost_chk_id desc limit 1`, this.migrationContext.DatabaseName, this.migrationContext.GetCheckpointTableName()))
	`635`	+ row := this.db.QueryRow(fmt.Sprintf(`select /* gh-ost / from %s.%s order by gh_ost_chk_id desc limit 1`, sql.EscapeName(this.migrationContext.DatabaseName), sql.EscapeName(this.migrationContext.GetCheckpointTableName())))
`636`	`636`	`chk := &Checkpoint{`
`637`	`637`	`IterationRangeMin: sql.NewColumnValues(this.migrationContext.UniqueKey.Columns.Len()),`
`638`	`638`	`IterationRangeMax: sql.NewColumnValues(this.migrationContext.UniqueKey.Columns.Len()),`