From c5614930496791f6f02a10d0de288fa1cf59dedf Mon Sep 17 00:00:00 2001 From: Jennifer Purevsuren Date: Wed, 27 May 2026 14:40:51 -0700 Subject: [PATCH 1/3] pass schema name for function --- go/go.mod | 2 +- go/go.sum | 4 ++-- go/libraries/doltcore/sqle/database_provider.go | 2 +- go/libraries/doltcore/sqle/writer/schema_cache.go | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go/go.mod b/go/go.mod index aab265555cd..df8de06f710 100644 --- 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.20260527162314-8764587064e4 + github.com/dolthub/go-mysql-server v0.20.1-0.20260527213526-aa57e6446067 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 index 0ade126f247..4902524ef35 100644 --- 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.20260527162314-8764587064e4 h1:ioyMzpxVr7PDwgwMQxZ0f66+2LUC0cECSSj94pDaFfg= -github.com/dolthub/go-mysql-server v0.20.1-0.20260527162314-8764587064e4/go.mod h1:482+GNJMKMZ6F0iq1wiAJ0Gg9ha4Y+z3LlBmwZZIanY= +github.com/dolthub/go-mysql-server v0.20.1-0.20260527213526-aa57e6446067 h1:+phbqTXvoOaVFdyfIykf5dqIpfWfE2cjyyZ4BS5ytbE= +github.com/dolthub/go-mysql-server v0.20.1-0.20260527213526-aa57e6446067/go.mod h1:482+GNJMKMZ6F0iq1wiAJ0Gg9ha4Y+z3LlBmwZZIanY= 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 index 34fb222b84b..1f6525af4cc 100644 --- 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 index 7c7650e0e1a..062b56e36ec 100644 --- 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) From 3a3cd20754c02b23d0652eec20e146502914a1ac Mon Sep 17 00:00:00 2001 From: Jennifer Purevsuren Date: Wed, 27 May 2026 16:53:25 -0700 Subject: [PATCH 2/3] bump --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index df8de06f710..8508f045c9d 100644 --- 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.20260527213526-aa57e6446067 + github.com/dolthub/go-mysql-server v0.20.1-0.20260527222812-1241d80cb803 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 index 4902524ef35..6cedb664744 100644 --- 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.20260527213526-aa57e6446067 h1:+phbqTXvoOaVFdyfIykf5dqIpfWfE2cjyyZ4BS5ytbE= -github.com/dolthub/go-mysql-server v0.20.1-0.20260527213526-aa57e6446067/go.mod h1:482+GNJMKMZ6F0iq1wiAJ0Gg9ha4Y+z3LlBmwZZIanY= +github.com/dolthub/go-mysql-server v0.20.1-0.20260527222812-1241d80cb803 h1:95okDUu3W1fgQgMYhJaT/iMVDFKuaWUkHRalS+6dhI0= +github.com/dolthub/go-mysql-server v0.20.1-0.20260527222812-1241d80cb803/go.mod h1:482+GNJMKMZ6F0iq1wiAJ0Gg9ha4Y+z3LlBmwZZIanY= 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= From 165cd83c50c66dff1de63aa9b7d08b3054798740 Mon Sep 17 00:00:00 2001 From: jennifersp <44716627+jennifersp@users.noreply.github.com> Date: Fri, 29 May 2026 16:59:17 +0000 Subject: [PATCH 3/3] [ga-bump-dep] Bump dependency in Dolt by jennifersp --- go/go.mod | 2 +- go/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/go.mod b/go/go.mod index d7ebc074539..31982ef1436 100644 --- 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 index d96f79d9d38..e1f1f698c94 100644 --- 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=