Support MariaDB UUID column type

claude · claude · commit b79a9e54527f · 2026-04-19T05:24:11.000Z
The TiDB parser used by the MySQL engine does not recognize MariaDB's UUID column type, so schemas like `id uuid NOT NULL DEFAULT (uuid())` fail with a syntax error (#3401). Upgrade the parser to the latest upstream revision and add a dolphin preprocessor that rewrites `uuid` column types to `binary(16)` (matching MariaDB's internal 16-byte storage) before parsing, then restores the `uuid` type name in the AST. Map `uuid` to `string` in the MySQL Go codegen so callers receive the canonical 36-character representation. https://claude.ai/code/session_01NX1Ept2eQUWQ26qi4HGpKi
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/lib/pq v1.12.3
 	github.com/ncruces/go-sqlite3 v0.33.3
 	github.com/pganalyze/pg_query_go/v6 v6.2.2
-	github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0
+	github.com/pingcap/tidb/pkg/parser v0.0.0-20260418072757-ce92298d1124
 	github.com/riza-io/grpc-go v0.2.0
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10
@@ -34,13 +34,14 @@ require (
 require (
 	cel.dev/expr v0.25.1 // indirect
 	filippo.io/edwards25519 v1.1.1 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/ncruces/go-sqlite3-wasm v1.1.1-0.20260409221933-87e4b35a38d0 // indirect
 	github.com/ncruces/julianday v1.0.0 // indirect
-	github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect
+	github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee // indirect
 	github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
 	github.com/pingcap/log v1.1.0 // indirect
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
diff --git a/go.sum b/go.sum
@@ -8,6 +8,8 @@ github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmO
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/cubicdaiya/gonp v1.0.4 h1:ky2uIAJh81WiLcGKBVD5R7KsM/36W6IqqTy6Bo6rGws=
 github.com/cubicdaiya/gonp v1.0.4/go.mod h1:iWGuP/7+JVTn02OWhRemVbMmG1DOUnmrGTYYACpOI0I=
@@ -58,14 +60,14 @@ github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvz
 github.com/pganalyze/pg_query_go/v6 v6.2.2 h1:O0L6zMC226R82RF3X5n0Ki6HjytDsoAzuzp4ATVAHNo=
 github.com/pganalyze/pg_query_go/v6 v6.2.2/go.mod h1:Cn6+j4870kJz3iYNsb0VsNG04vpSWgEvBwc590J4qD0=
 github.com/pingcap/errors v0.11.0/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
-github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb h1:3pSi4EDG6hg0orE1ndHkXvX6Qdq2cZn8gAPir8ymKZk=
-github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
+github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee h1:/IDPbpzkzA97t1/Z1+C3KlxbevjMeaI6BQYxvivu4u8=
+github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
 github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 h1:tdMsjOqUR7YXHoBitzdebTvOjs/swniBTOLy5XiMtuE=
 github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86/go.mod h1:exzhVYca3WRtd6gclGNErRWb1qEgff3LYta0LvRmON4=
 github.com/pingcap/log v1.1.0 h1:ELiPxACz7vdo1qAvvaWJg1NrYFoY6gqAh/+Uo6aXdD8=
 github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
-github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0 h1:W3rpAI3bubR6VWOcwxDIG0Gz9G5rl5b3SL116T0vBt0=
-github.com/pingcap/tidb/pkg/parser v0.0.0-20250324122243-d51e00e5bbf0/go.mod h1:+8feuexTKcXHZF/dkDfvCwEyBAmgb4paFc3/WeYV2eE=
+github.com/pingcap/tidb/pkg/parser v0.0.0-20260418072757-ce92298d1124 h1:zYmP5fBH+i2yhhU6f5uOol6zxHtR2/sD47BsJLfy0oU=
+github.com/pingcap/tidb/pkg/parser v0.0.0-20260418072757-ce92298d1124/go.mod h1:zDLDsfNBU5+L6T4J9/OgWAHc/WZvMUjbpgHqQ/t3yKo=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go
@@ -114,6 +114,14 @@ func mysqlType(req *plugin.GenerateRequest, options *opts.Options, col *plugin.C
 	case "json":
 		return "json.RawMessage"
 
+	case "uuid":
+		// MariaDB UUID type. The go-sql-driver returns UUID values as the
+		// canonical 36-character string representation.
+		if notNull {
+			return "string"
+		}
+		return "sql.NullString"
+
 	case "any":
 		return "interface{}"
 
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/exec.json b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/exec.json
@@ -0,0 +1,6 @@
+{
+    "contexts": ["base"],
+    "meta": {
+        "invalid_schema": true
+    }
+}
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/go/db.go b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/go/db.go
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/go/models.go b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/go/models.go
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/go/query.sql.go b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/query.sql b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/query.sql
@@ -0,0 +1,8 @@
+-- name: GetDocument :one
+SELECT * FROM documents WHERE id = ?;
+
+-- name: ListDocuments :many
+SELECT * FROM documents;
+
+-- name: CreateDocument :exec
+INSERT INTO documents (owner) VALUES (?);
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/schema.sql b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/schema.sql
@@ -0,0 +1,15 @@
+CREATE TABLE `organisations` (
+  `id`          int         NOT NULL AUTO_INCREMENT,
+  `name`        varchar(64) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  PRIMARY KEY (`id`)
+);
+
+CREATE TABLE `documents` (
+  `id`       uuid     NOT NULL DEFAULT (uuid()),
+  `uploaded` datetime NOT NULL DEFAULT (current_timestamp()),
+  `owner`    int      NOT NULL,
+  PRIMARY KEY (`id`),
+  INDEX      `owner`  (`owner`),
+  CONSTRAINT `owner` FOREIGN KEY (`owner`) REFERENCES `organisations` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+);
diff --git a/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/sqlc.json b/internal/endtoend/testdata/mysql_mariadb_uuid/mysql/sqlc.json
@@ -0,0 +1,14 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "sql_package": "database/sql",
+      "sql_driver": "github.com/go-sql-driver/mysql",
+      "engine": "mysql",
+      "name": "querytest",
+      "schema": "schema.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/engine/dolphin/parse.go b/internal/engine/dolphin/parse.go
@@ -15,6 +15,17 @@ import (
 	"github.com/sqlc-dev/sqlc/internal/sql/sqlerr"
 )
 
+// MariaDB's UUID column type is not supported by the TiDB parser. The
+// preprocessor rewrites `uuid` column types to `binary(16)` (matching
+// MariaDB's internal 16-byte storage) so the statement can be parsed, then
+// restores the type name to `uuid` in the AST.
+//
+// The regex captures the column identifier (bare or backtick-quoted), the
+// whitespace separator, and whatever follows the `uuid` token. The Go
+// RE2 engine has no lookahead, so rewriteMariaDBUUID inspects the trailing
+// capture to skip cases where `uuid` is actually a function call (`uuid(`).
+var mariadbUUIDColumnDef = regexp.MustCompile("(?i)(`[^`]+`|[A-Za-z_][A-Za-z0-9_]*)(\\s+)uuid(\\s*\\(|\\b)")
+
 func NewParser() *Parser {
 	return &Parser{parser.New()}
 }
@@ -53,7 +64,8 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	if err != nil {
 		return nil, err
 	}
-	stmtNodes, _, err := p.pingcap.Parse(string(blob), "", "")
+	input, uuidColumns := rewriteMariaDBUUID(string(blob))
+	stmtNodes, _, err := p.pingcap.Parse(input, "", "")
 	if err != nil {
 		return nil, normalizeErr(err)
 	}
@@ -67,13 +79,17 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 
 		// TODO: Attach the text directly to the ast.Statement node
 		text := stmtNodes[i].Text()
-		loc := strings.Index(string(blob), text)
+		loc := strings.Index(input, text)
 
 		stmtLen := len(text)
 		if text[stmtLen-1] == ';' {
 			stmtLen -= 1 // Subtract one to remove semicolon
 		}
 
+		if len(uuidColumns) > 0 {
+			restoreMariaDBUUID(out, uuidColumns)
+		}
+
 		stmts = append(stmts, ast.Statement{
 			Raw: &ast.RawStmt{
 				Stmt:         out,
@@ -85,6 +101,90 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	return stmts, nil
 }
 
+// rewriteMariaDBUUID replaces MariaDB-style `uuid` column types with
+// `binary(16)` so the TiDB parser accepts the statement. The second return
+// value is the set of lowercased column names that originally had the uuid
+// type, used later to restore the type name in the AST.
+func rewriteMariaDBUUID(src string) (string, map[string]struct{}) {
+	matches := mariadbUUIDColumnDef.FindAllStringSubmatchIndex(src, -1)
+	if len(matches) == 0 {
+		return src, nil
+	}
+	uuidColumns := make(map[string]struct{})
+	var b strings.Builder
+	b.Grow(len(src))
+	last := 0
+	for _, m := range matches {
+		// m[0]:m[1] = full match
+		// m[2]:m[3] = identifier
+		// m[4]:m[5] = whitespace between identifier and uuid
+		// m[6]:m[7] = trailing context (either `\s*(` or a word boundary)
+		trailing := src[m[6]:m[7]]
+		if strings.HasPrefix(strings.TrimLeft(trailing, " \t\n\r"), "(") {
+			// `uuid(` - function call, skip.
+			continue
+		}
+		ident := src[m[2]:m[3]]
+		name := strings.Trim(ident, "`")
+		uuidColumns[strings.ToLower(name)] = struct{}{}
+		// Replace the `uuid` keyword, preserve the identifier, whitespace,
+		// and trailing context.
+		uuidStart := m[5]
+		uuidEnd := m[6]
+		b.WriteString(src[last:uuidStart])
+		b.WriteString("binary(16)")
+		last = uuidEnd
+	}
+	b.WriteString(src[last:])
+	return b.String(), uuidColumns
+}
+
+// restoreMariaDBUUID walks the statement and rewrites any ColumnDef whose
+// name was recorded as an originally-uuid column back to the `uuid` type.
+// Only CreateTableStmt and AlterTableStmt currently introduce ColumnDef
+// nodes, so handle those explicitly.
+func restoreMariaDBUUID(node ast.Node, uuidColumns map[string]struct{}) {
+	switch n := node.(type) {
+	case *ast.CreateTableStmt:
+		for _, col := range n.Cols {
+			restoreColumnDefType(col, uuidColumns)
+		}
+	case *ast.AlterTableStmt:
+		if n.Cmds == nil {
+			return
+		}
+		for _, item := range n.Cmds.Items {
+			cmd, ok := item.(*ast.AlterTableCmd)
+			if !ok {
+				continue
+			}
+			restoreColumnDefType(cmd.Def, uuidColumns)
+		}
+	}
+}
+
+func restoreColumnDefType(col *ast.ColumnDef, uuidColumns map[string]struct{}) {
+	if col == nil || col.TypeName == nil {
+		return
+	}
+	// Only restore if the column was both recorded as originally-uuid and
+	// its parsed type matches the `binary(16)` substitution. Checking the
+	// type too avoids mangling same-named columns (e.g. another table's
+	// unrelated `id int`) when multiple statements are parsed together.
+	if col.TypeName.Name != "binary" {
+		return
+	}
+	if col.Length == nil || *col.Length != 16 {
+		return
+	}
+	if _, ok := uuidColumns[strings.ToLower(col.Colname)]; !ok {
+		return
+	}
+	col.TypeName.Name = "uuid"
+	col.TypeName.Typmods = nil
+	col.Length = nil
+}
+
 // https://dev.mysql.com/doc/refman/8.0/en/comments.html
 func (p *Parser) CommentSyntax() source.CommentSyntax {
 	return source.CommentSyntax{
diff --git a/internal/engine/dolphin/parse_uuid_test.go b/internal/engine/dolphin/parse_uuid_test.go
