add mariadb-binlog.bats and fix test 1

elianddb · elianddb · commit ebddd6bf3d3f · 2025-10-22T23:42:39.000-07:00
diff --git a/go.mod b/go.mod
@@ -41,4 +41,6 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 )
 
+replace github.com/dolthub/vitess => ../vitess
+
 go 1.25.0
diff --git a/sql/collations.go b/sql/collations.go
@@ -972,3 +972,40 @@ type TypeWithCollation interface {
 	// whether to include the character set and/or collation information.
 	StringWithTableCollation(tableCollation CollationID) string
 }
+
+// ConvertCollationID converts numeric collation IDs to their string names.
+func ConvertCollationID(val any) (any, error) {
+	if _, ok := val.(string); ok {
+		return val, nil
+	}
+
+	var collationID uint64
+	switch v := val.(type) {
+	case int8:
+		collationID = uint64(v)
+	case int16:
+		collationID = uint64(v)
+	case int:
+		collationID = uint64(v)
+	case int32:
+		collationID = uint64(v)
+	case int64:
+		collationID = uint64(v)
+	case uint8:
+		collationID = uint64(v)
+	case uint16:
+		collationID = uint64(v)
+	case uint:
+		collationID = uint64(v)
+	case uint32:
+		collationID = uint64(v)
+	case uint64:
+		collationID = v
+	default:
+		return val, nil
+	}
+
+	// Convert numeric ID to collation name
+	collation := CollationID(collationID).Collation()
+	return collation.Name, nil
+}
diff --git a/sql/plan/binlog.go b/sql/plan/binlog.go
@@ -0,0 +1,69 @@
+// Copyright 2025 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package plan
+
+import (
+	"github.com/dolthub/go-mysql-server/sql"
+)
+
+// Binlog represents the BINLOG statement, an internal-use statement generated by mysqlbinlog to execute binary log events (format description events and row events).
+// https://dev.mysql.com/doc/refman/8.4/en/binlog.html
+type Binlog struct {
+	Base64Str string
+}
+
+var _ sql.Node = (*Binlog)(nil)
+
+// NewBinlog creates a new Binlog node.
+func NewBinlog(base64Str string) *Binlog {
+	return &Binlog{
+		Base64Str: base64Str,
+	}
+}
+
+// RowIter implements the sql.Node interface.
+func (b *Binlog) RowIter(ctx *sql.Context, _ sql.Row) (sql.RowIter, error) {
+	// TODO: Decode base64 data and execute binary log events
+	// For now, this is a no-op
+	return sql.RowsToRowIter(), nil
+}
+
+func (b *Binlog) String() string {
+	return "BINLOG"
+}
+
+func (b *Binlog) Resolved() bool {
+	return true
+}
+
+func (b *Binlog) Schema() sql.Schema {
+	return nil
+}
+
+func (b *Binlog) Children() []sql.Node {
+	return nil
+}
+
+func (b *Binlog) IsReadOnly() bool {
+	return false
+}
+
+// WithChildren implements the Node interface.
+func (b *Binlog) WithChildren(children ...sql.Node) (sql.Node, error) {
+	if len(children) != 0 {
+		return nil, sql.ErrInvalidChildrenNumber.New(b, len(children), 0)
+	}
+	return b, nil
+}
diff --git a/sql/planbuilder/builder.go b/sql/planbuilder/builder.go
@@ -401,6 +401,9 @@ func (b *Builder) buildSubquery(inScope *scope, stmt ast.Statement, subQuery str
 		return b.buildDeallocate(inScope, n)
 	case ast.InjectedStatement:
 		return b.buildInjectedStatement(inScope, n)
+	case *ast.Binlog:
+		outScope = inScope.push()
+		outScope.node = plan.NewBinlog(n.Base64Str)
 	}
 	return
 }
diff --git a/sql/rowexec/rel_iters.go b/sql/rowexec/rel_iters.go
@@ -16,6 +16,7 @@ package rowexec
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"strings"
 
@@ -392,18 +393,22 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 	if err != nil {
 		return err
 	}
+
 	err = validateSystemVariableValue(sysVar.Name, val)
 	if err != nil {
 		return err
 	}
-	err = sysVar.Scope.SetValue(ctx, sysVar.Name, val)
-	if err != nil {
-		return err
-	}
 
 	// Setting `character_set_connection` and `collation_connection` will set the corresponding variable
 	// Setting `character_set_server` and `collation_server` will set the corresponding variable
+	// Handle MariaDB binlog numeric conversions for sql_mode and collation IDs
 	switch strings.ToLower(sysVar.Name) {
+	case "sql_mode":
+		val, err = sql.ConvertSqlModeBitmask(val)
+		if err != nil {
+			return err
+		}
+		return sysVar.Scope.SetValue(ctx, sysVar.Name, val)
 	case "character_set_connection":
 		if val == nil {
 			return sysVar.Scope.SetValue(ctx, "collation_connection", val)
@@ -420,8 +425,17 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 		collationName := charset.DefaultCollation().Name()
 		return sysVar.Scope.SetValue(ctx, "collation_connection", collationName)
 	case "collation_connection":
+		// Convert numeric collation ID to name (from MariaDB binlogs)
+		val, err = sql.ConvertCollationID(val)
+		if err != nil {
+			return err
+		}
+		err = sysVar.Scope.SetValue(ctx, sysVar.Name, val)
+		if err != nil {
+			return err
+		}
 		if val == nil {
-			return sysVar.Scope.SetValue(ctx, "character_set_connection", val)
+			return sysVar.Scope.SetValue(ctx, "character_set_connection", nil)
 		}
 		valStr, ok := val.(string)
 		if !ok {
@@ -450,8 +464,17 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 		collationName := charset.DefaultCollation().Name()
 		return sysVar.Scope.SetValue(ctx, "collation_server", collationName)
 	case "collation_server":
+		// Convert numeric collation ID to name (from MariaDB binlogs)
+		val, err = sql.ConvertCollationID(val)
+		if err != nil {
+			return err
+		}
+		err = sysVar.Scope.SetValue(ctx, sysVar.Name, val)
+		if err != nil {
+			return err
+		}
 		if val == nil {
-			return sysVar.Scope.SetValue(ctx, "character_set_server", val)
+			return sysVar.Scope.SetValue(ctx, "character_set_server", nil)
 		}
 		valStr, ok := val.(string)
 		if !ok {
@@ -464,8 +487,23 @@ func setSystemVar(ctx *sql.Context, sysVar *expression.SystemVar, right sql.Expr
 		}
 		charsetName := collation.CharacterSet().Name()
 		return sysVar.Scope.SetValue(ctx, "character_set_server", charsetName)
+	case "collation_database":
+		// Convert numeric collation ID to name (from MariaDB binlogs)
+		val, err = sql.ConvertCollationID(val)
+		if err != nil {
+			return err
+		}
+		return sysVar.Scope.SetValue(ctx, sysVar.Name, val)
+	case "lc_time_names":
+		// TODO: convert numeric locale ID to locale name
+		switch val.(type) {
+		case int8, int16, int, int32, int64, uint8, uint16, uint, uint32, uint64:
+			val = fmt.Sprintf("%v", val)
+		}
+		return sysVar.Scope.SetValue(ctx, sysVar.Name, val)
+	default:
+		return sysVar.Scope.SetValue(ctx, sysVar.Name, val)
 	}
-	return nil
 }
 
 func validateSystemVariableValue(sysVarName string, val interface{}) error {
diff --git a/sql/sql_mode.go b/sql/sql_mode.go
@@ -24,33 +24,86 @@ import (
 const (
 	SqlModeSessionVar = "SQL_MODE"
 
+	RealAsFloat           = "REAL_AS_FLOAT"
+	PipesAsConcat         = "PIPES_AS_CONCAT"
+	ANSIQuotes            = "ANSI_QUOTES"
+	IgnoreSpace           = "IGNORE_SPACE"
+	OnlyFullGroupBy       = "ONLY_FULL_GROUP_BY"
+	NoUnsignedSubtraction = "NO_UNSIGNED_SUBTRACTION"
+	NoDirInCreate         = "NO_DIR_IN_CREATE"
+	// ANSI mode includes REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, and ONLY_FULL_GROUP_BY
+	ANSI                   = "ANSI"
+	NoAutoValueOnZero      = "NO_AUTO_VALUE_ON_ZERO"
+	NoBackslashEscapes     = "NO_BACKSLASH_ESCAPES"
+	StrictTransTables      = "STRICT_TRANS_TABLES"
+	StrictAllTables        = "STRICT_ALL_TABLES"
+	NoZeroInDate           = "NO_ZERO_IN_DATE"
 	AllowInvalidDates      = "ALLOW_INVALID_DATES"
-	ANSIQuotes             = "ANSI_QUOTES"
 	ErrorForDivisionByZero = "ERROR_FOR_DIVISION_BY_ZERO"
+	// Traditional mode includes STRICT_TRANS_TABLES, STRICT_ALL_TABLES, NO_ZERO_IN_DATE, ERROR_FOR_DIVISION_BY_ZERO,
+	// and NO_ENGINE_SUBSTITUTION
+	Traditional            = "TRADITIONAL"
 	HighNotPrecedence      = "HIGH_NOT_PRECEDENCE"
-	IgnoreSpaces           = "IGNORE_SPACE"
-	NoAutoValueOnZero      = "NO_AUTO_VALUE_ON_ZERO"
-	NoBackslashEscapes     = "NO_BACKSLASH_ESCAPES"
-	NoDirInCreate          = "NO_DIR_IN_CREATE"
 	NoEngineSubstitution   = "NO_ENGINE_SUBSTITUTION"
-	NoUnsignedSubtraction  = "NO_UNSIGNED_SUBTRACTION"
-	NoZeroInDate           = "NO_ZERO_IN_DATE"
-	OnlyFullGroupBy        = "ONLY_FULL_GROUP_BY"
 	PadCharToFullLength    = "PAD_CHAR_TO_FULL_LENGTH"
-	PipesAsConcat          = "PIPES_AS_CONCAT"
-	RealAsFloat            = "REAL_AS_FLOAT"
-	StrictTransTables      = "STRICT_TRANS_TABLES"
-	StrictAllTables        = "STRICT_ALL_TABLES"
 	TimeTruncateFractional = "TIME_TRUNCATE_FRACTIONAL"
+)
 
-	// ANSI mode includes REAL_AS_FLOAT, PIPES_AS_CONCAT, ANSI_QUOTES, IGNORE_SPACE, and ONLY_FULL_GROUP_BY
-	ANSI = "ANSI"
-	// Traditional mode includes STRICT_TRANS_TABLES, STRICT_ALL_TABLES, NO_ZERO_IN_DATE, ERROR_FOR_DIVISION_BY_ZERO,
-	// and NO_ENGINE_SUBSTITUTION
-	Traditional    = "TRADITIONAL"
-	DefaultSqlMode = "NO_ENGINE_SUBSTITUTION,ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES"
+// Bits for different SQL modes (from mysql-server/sql/system_variables.h)
+const (
+	modeRealAsFloat            = 1
+	modePipesAsConcat          = 2
+	modeAnsiQuotes             = 4
+	modeIgnoreSpace            = 8
+	modeOnlyFullGroupBy        = 32
+	modeNoUnsignedSubtraction  = 64
+	modeNoDirInCreate          = 128
+	modeAnsi                   = 0x40000
+	modeNoAutoValueOnZero      = modeAnsi * 2
+	modeNoBackslashEscapes     = modeNoAutoValueOnZero * 2
+	modeStrictTransTables      = modeNoBackslashEscapes * 2
+	modeStrictAllTables        = modeStrictTransTables * 2
+	modeNoZeroInDate           = modeStrictAllTables * 2
+	modeNoZeroDate             = modeNoZeroInDate * 2
+	modeAllowInvalidDates      = modeNoZeroDate * 2
+	modeErrorForDivisionByZero = modeAllowInvalidDates * 2
+	modeTraditional            = modeErrorForDivisionByZero * 2
+	modeHighNotPrecedence      = 1 << 29
+	modeNoEngineSubstitution   = modeHighNotPrecedence * 2
+	modePadCharToFullLength    = 1 << 31
+	modeTimeTruncateFractional = 1 << 32
 )
 
+// sqlModeBitMap maps SQL mode bit flags to their string names.
+var sqlModeBitMap = map[uint64]string{
+	modeRealAsFloat:            RealAsFloat,
+	modePipesAsConcat:          PipesAsConcat,
+	modeAnsiQuotes:             ANSIQuotes,
+	modeIgnoreSpace:            IgnoreSpace,
+	modeOnlyFullGroupBy:        OnlyFullGroupBy,
+	modeNoUnsignedSubtraction:  NoUnsignedSubtraction,
+	modeNoDirInCreate:          NoDirInCreate,
+	modeAnsi:                   ANSI,
+	modeNoAutoValueOnZero:      NoAutoValueOnZero,
+	modeNoBackslashEscapes:     NoBackslashEscapes,
+	modeStrictTransTables:      StrictTransTables,
+	modeStrictAllTables:        StrictAllTables,
+	modeNoZeroInDate:           NoZeroInDate,
+	modeAllowInvalidDates:      AllowInvalidDates,
+	modeErrorForDivisionByZero: ErrorForDivisionByZero,
+	modeTraditional:            Traditional,
+	modeHighNotPrecedence:      HighNotPrecedence,
+	modeNoEngineSubstitution:   NoEngineSubstitution,
+	modePadCharToFullLength:    PadCharToFullLength,
+	modeTimeTruncateFractional: TimeTruncateFractional,
+}
+
+var DefaultSqlMode = strings.Join([]string{
+	NoEngineSubstitution,
+	OnlyFullGroupBy,
+	StrictTransTables,
+}, ",")
+
 var defaultMode *SqlMode
 
 func init() {
@@ -170,3 +223,49 @@ func (s *SqlMode) ParserOptions() sqlparser.ParserOptions {
 func (s *SqlMode) String() string {
 	return s.modeString
 }
+
+// ConvertSqlModeBitmask converts sql_mode values to their string representation.
+func ConvertSqlModeBitmask(val any) (any, error) {
+	if _, ok := val.(string); ok {
+		return val, nil
+	}
+
+	var bitmask uint64
+	switch v := val.(type) {
+	case int8:
+		bitmask = uint64(v)
+	case int16:
+		bitmask = uint64(v)
+	case int:
+		bitmask = uint64(v)
+	case int32:
+		bitmask = uint64(v)
+	case int64:
+		bitmask = uint64(v)
+	case uint8:
+		bitmask = uint64(v)
+	case uint16:
+		bitmask = uint64(v)
+	case uint:
+		bitmask = uint64(v)
+	case uint32:
+		bitmask = uint64(v)
+	case uint64:
+		bitmask = v
+	default:
+		return val, nil
+	}
+
+	var modes []string
+	for bit, modeName := range sqlModeBitMap {
+		if bitmask&bit != 0 {
+			modes = append(modes, modeName)
+		}
+	}
+
+	if len(modes) == 0 {
+		return "", nil
+	}
+
+	return strings.Join(modes, ","), nil
+}
diff --git a/sql/variables/system_variables.go b/sql/variables/system_variables.go

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,6 @@ require (`
`41`	`41`	`gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect`
`42`	`42`	`)`
`43`	`43`
	`44`	`+replace github.com/dolthub/vitess => ../vitess`
	`45`	`+`
`44`	`46`	`go 1.25.0`
Original file line number	Diff line number	Diff line change
`@@ -401,6 +401,9 @@ func (b Builder) buildSubquery(inScope scope, stmt ast.Statement, subQuery str`
`401`	`401`	`return b.buildDeallocate(inScope, n)`
`402`	`402`	`case ast.InjectedStatement:`
`403`	`403`	`return b.buildInjectedStatement(inScope, n)`
	`404`	`+ case *ast.Binlog:`
	`405`	`+ outScope = inScope.push()`
	`406`	`+ outScope.node = plan.NewBinlog(n.Base64Str)`
`404`	`407`	`}`
`405`	`408`	`return`
`406`	`409`	`}`