Updating and using AlterTableOptions

Author: shlomi-noach

go/base/context.go

@@ -77,9 +77,10 @@ func NewThrottleCheckResult(throttle bool, reason string, reasonHint ThrottleRea
 type MigrationContext struct {
 	Uuid string
 
-	DatabaseName      string
-	OriginalTableName string
-	AlterStatement    string
+	DatabaseName          string
+	OriginalTableName     string
+	AlterStatement        string
+	AlterStatementOptions string // anything following the 'ALTER TABLE [schema.]table' from AlterStatement
 
 	CountTableRows           bool
 	ConcurrentCountTableRows bool

go/cmd/gh-ost/main.go

@@ -177,6 +177,7 @@ func main() {
 		log.Fatalf("--alter must be provided and statement must not be empty")
 	}
 	parser := sql.NewParserFromAlterStatement(migrationContext.AlterStatement)
+	migrationContext.AlterStatementOptions = parser.GetAlterStatementOptions()
 
 	if migrationContext.DatabaseName == "" {
 		if parser.HasExplicitSchema() {

go/logic/applier.go

@@ -190,7 +190,7 @@ func (this *Applier) AlterGhost() error {
 	query := fmt.Sprintf(`alter /* gh-ost */ table %s.%s %s`,
 		sql.EscapeName(this.migrationContext.DatabaseName),
 		sql.EscapeName(this.migrationContext.GetGhostTableName()),
-		this.migrationContext.AlterStatement,
+		this.migrationContext.AlterStatementOptions,
 	)
 	this.migrationContext.Log.Infof("Altering ghost table %s.%s",
 		sql.EscapeName(this.migrationContext.DatabaseName),

go/sql/parser.go

@@ -33,7 +33,8 @@ type AlterTableParser struct {
 	droppedColumns  map[string]bool
 	isRenameTable   bool
 
-	alterTokens []string
+	alterStatementOptions string
+	alterTokens           []string
 
 	explicitSchema string
 	explicitTable  string
@@ -120,22 +121,23 @@ func (this *AlterTableParser) parseAlterToken(alterToken string) (err error) {
 
 func (this *AlterTableParser) ParseAlterStatement(alterStatement string) (err error) {
 
+	this.alterStatementOptions = alterStatement
 	for _, alterTableRegexp := range alterTableExplicitSchemaTableRegexps {
-		if submatch := alterTableRegexp.FindStringSubmatch(alterStatement); len(submatch) > 0 {
+		if submatch := alterTableRegexp.FindStringSubmatch(this.alterStatementOptions); len(submatch) > 0 {
 			this.explicitSchema = submatch[1]
 			this.explicitTable = submatch[2]
-			alterStatement = submatch[3]
+			this.alterStatementOptions = submatch[3]
 			break
 		}
 	}
 	for _, alterTableRegexp := range alterTableExplicitTableRegexps {
-		if submatch := alterTableRegexp.FindStringSubmatch(alterStatement); len(submatch) > 0 {
+		if submatch := alterTableRegexp.FindStringSubmatch(this.alterStatementOptions); len(submatch) > 0 {
 			this.explicitTable = submatch[1]
-			alterStatement = submatch[2]
+			this.alterStatementOptions = submatch[2]
 			break
 		}
 	}
-	alterTokens, _ := this.tokenizeAlterStatement(alterStatement)
+	alterTokens, _ := this.tokenizeAlterStatement(this.alterStatementOptions)
 	for _, alterToken := range alterTokens {
 		alterToken = this.sanitizeQuotesFromAlterStatement(alterToken)
 		this.parseAlterToken(alterToken)
@@ -180,3 +182,7 @@ func (this *AlterTableParser) GetExplicitTable() string {
 func (this *AlterTableParser) HasExplicitTable() bool {
 	return this.GetExplicitTable() != ""
 }
+
+func (this *AlterTableParser) GetAlterStatementOptions() string {
+	return this.alterStatementOptions
+}