Fix tweaks

go/logic/applier.go

@@ -876,7 +876,7 @@ func (this *Applier) ExpectProcess(sessionId int64, stateHint, infoHint string)
 			id != connection_id()
 			and ? in (0, id)
 			and state like concat('%', ?, '%')
-			and info  like concat('%', ?, '%')`
+			and info like concat('%', ?, '%')`
 	err := sqlutils.QueryRowsMap(this.db, query, func(m sqlutils.RowMap) error {
 		found = true
 		return nil

go/sql/builder.go

@@ -227,9 +227,13 @@ func BuildRangeInsertQuery(databaseName, originalTableName, ghostTableName strin
 			%s.%s
 			(%s)
 		(
-			select %s from %s.%s
+			select %s
+			from
+				%s.%s
 			force index (%s)
-			where (%s and %s) %s
+			where
+				(%s and %s)
+				%s
 		)`,
 		databaseName, originalTableName, databaseName, ghostTableName, mappedSharedColumnsListing,
 		sharedColumnsListing, databaseName, originalTableName, uniqueKey,
@@ -283,7 +287,8 @@ func BuildUniqueKeyRangeEndPreparedQueryViaOffset(databaseName, tableName string
 			%s
 		from
 			%s.%s
-		where %s and %s
+		where
+			%s and %s
 		order by
 			%s
 		limit 1
@@ -340,7 +345,8 @@ func BuildUniqueKeyRangeEndPreparedQueryViaTemptable(databaseName, tableName str
 				%s
 			from
 				%s.%s
-			where %s and %s
+			where
+				%s and %s
 			order by
 				%s
 			limit %d) select_osc_chunk