pass schema name for function (#11109)

jennifersp · web-flow · commit e75d21b12642 · 2026-05-29T11:26:54.000-07:00
diff --git a/go/go.mod b/go/go.mod
@@ -64,7 +64,7 @@ require (
 	github.com/dolthub/dolt-mcp v0.3.4
 	github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.20.1-0.20260528221811-29886bb10b26
+	github.com/dolthub/go-mysql-server v0.20.1-0.20260529165710-0c9baca7aa28
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
 	github.com/edsrzf/mmap-go v1.2.0
 	github.com/esote/minmaxheap v1.0.0
diff --git a/go/go.sum b/go/go.sum
@@ -214,8 +214,8 @@ github.com/dolthub/fslock v0.0.4 h1:p0FcUPu81bO53349qPT1im7XyGu3CwZDsB0PEVdFcaE=
 github.com/dolthub/fslock v0.0.4/go.mod h1:895XJNoMTlL5N1TjOJbd9Pnpjtv1DW/Ddw9qShcAYsM=
 github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 h1:U6gSf5I0e6h6GP1/5Sa7D2lWW1CWfcVPtY5wkyHq6jY=
 github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260528221811-29886bb10b26 h1:CFR0vFhNJO9Q5LyPulyQhmbiUzPYKxbFCKnR/fBkwT4=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260528221811-29886bb10b26/go.mod h1:UTL4UvG/y8PMBcI8I60gf0DH4YPBALW/8UQCcvft95Y=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260529165710-0c9baca7aa28 h1:7/u3ZCuzvCLF7u8oE3ZhdqhtXHnjXIf7fsdqevHa7ms=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260529165710-0c9baca7aa28/go.mod h1:UTL4UvG/y8PMBcI8I60gf0DH4YPBALW/8UQCcvft95Y=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM=
diff --git a/go/libraries/doltcore/sqle/database_provider.go b/go/libraries/doltcore/sqle/database_provider.go
@@ -1622,7 +1622,7 @@ func (p *DoltDatabaseProvider) SessionDatabase(ctx *sql.Context, name string) (d
 }
 
 // Function implements the FunctionProvider interface
-func (p *DoltDatabaseProvider) Function(_ *sql.Context, name string) (sql.Function, bool) {
+func (p *DoltDatabaseProvider) Function(_ *sql.Context, schema, name string) (sql.Function, bool) {
 	fn, ok := p.functions[strings.ToLower(name)]
 	if !ok {
 		return nil, false
diff --git a/go/libraries/doltcore/sqle/writer/schema_cache.go b/go/libraries/doltcore/sqle/writer/schema_cache.go
@@ -98,6 +98,7 @@ func newWriterSchema(ctx *sql.Context, t *doltdb.Table, tableName string, dbName
 			PrefixLengths: def.PrefixLengths(),
 		}
 		if predStr := def.Predicate(); predStr != "" {
+			// TODO: need to set the schema in search_path? it cannot find tables and types.
 			predExpr, err := expranalysis.ResolvePredicateExpression(ctx, tableName, predStr)
 			if err != nil {
 				return nil, fmt.Errorf("failed to compile partial index predicate for %s: %w", def.Name(), err)

Original file line number	Diff line number	Diff line change
`@@ -1622,7 +1622,7 @@ func (p DoltDatabaseProvider) SessionDatabase(ctx sql.Context, name string) (d`
`1622`	`1622`	`}`
`1623`	`1623`
`1624`	`1624`	`// Function implements the FunctionProvider interface`
`1625`		`-func (p DoltDatabaseProvider) Function(_ sql.Context, name string) (sql.Function, bool) {`
	`1625`	`+func (p DoltDatabaseProvider) Function(_ sql.Context, schema, name string) (sql.Function, bool) {`
`1626`	`1626`	`fn, ok := p.functions[strings.ToLower(name)]`
`1627`	`1627`	`if !ok {`
`1628`	`1628`	`return nil, false`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ func newWriterSchema(ctx sql.Context, t doltdb.Table, tableName string, dbName`
`98`	`98`	`PrefixLengths: def.PrefixLengths(),`
`99`	`99`	`}`
`100`	`100`	`if predStr := def.Predicate(); predStr != "" {`
	`101`	`+ // TODO: need to set the schema in search_path? it cannot find tables and types.`
`101`	`102`	`predExpr, err := expranalysis.ResolvePredicateExpression(ctx, tableName, predStr)`
`102`	`103`	`if err != nil {`
`103`	`104`	`return nil, fmt.Errorf("failed to compile partial index predicate for %s: %w", def.Name(), err)`