Merge pull request #2588 from dolthub/taylor/version-fn

Only register `version` function if it doesn't already exist
dolthub · Jul 9, 2024 · 10da4b7 · 10da4b7
2 parents c061ac3 + 9d70f93
commit 10da4b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/engine.go b/engine.go
@@ -169,10 +169,14 @@ func New(a *analyzer.Analyzer, cfg *Config) *Engine {
 	ls := sql.NewLockSubsystem()
 
 	emptyCtx := sql.NewEmptyContext()
-	a.Catalog.RegisterFunction(emptyCtx, sql.FunctionN{
-		Name: "version",
-		Fn:   function.NewVersion(cfg.VersionPostfix),
-	})
+
+	if fn, err := a.Catalog.Function(emptyCtx, "version"); fn == nil || err != nil {
+		a.Catalog.RegisterFunction(emptyCtx, sql.FunctionN{
+			Name: "version",
+			Fn:   function.NewVersion(cfg.VersionPostfix),
+		})
+	}
+
 	a.Catalog.RegisterFunction(emptyCtx, function.GetLockingFuncs(ls)...)
 
 	ret := &Engine{

diff --git a/sql/information_schema/information_schema.go b/sql/information_schema/information_schema.go
@@ -1946,7 +1946,6 @@ func tablesRowIter(ctx *Context, cat Catalog) (RowIter, error) {
 				}
 			}
 
-			// TODO: use different values for databases that support schemas
 			rows = append(rows, Row{
 				catalogName,    // table_catalog
 				schemaName,     // table_schema