Fixed issues 2547 and 2557

Author: Hydrocharged

server/functions/concat.go

@@ -0,0 +1,68 @@
+// Copyright 2026 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 functions
+
+import (
+	"strings"
+
+	"github.com/dolthub/go-mysql-server/sql"
+
+	"github.com/dolthub/doltgresql/server/functions/framework"
+	pgtypes "github.com/dolthub/doltgresql/server/types"
+)
+
+// initConcat registers the functions to the catalog.
+func initConcat() {
+	framework.RegisterFunction(concat_any)
+}
+
+// concat_any represents the PostgreSQL function of the same name, taking the same parameters.
+var concat_any = framework.Function1N{
+	Name:       "concat",
+	Return:     pgtypes.Text,
+	Parameters: [1]*pgtypes.DoltgresType{pgtypes.Any},
+	Strict:     false,
+	Callable: func(ctx *sql.Context, t []*pgtypes.DoltgresType, val1 any, vals []any) (any, error) {
+		sb := strings.Builder{}
+		if val1 != nil {
+			output, err := t[0].IoOutput(ctx, val1)
+			if err != nil {
+				return nil, err
+			}
+			sb.WriteString(output)
+		}
+		for i, val := range vals {
+			if val == nil {
+				continue
+			}
+			valType := t[i+1]
+			if valType.ID == pgtypes.Bool.ID {
+				// Within this context, `bool` returns 't' rather than 'true'
+				if val.(bool) {
+					sb.WriteRune('t')
+				} else {
+					sb.WriteRune('f')
+				}
+			} else {
+				output, err := valType.IoOutput(ctx, val)
+				if err != nil {
+					return nil, err
+				}
+				sb.WriteString(output)
+			}
+		}
+		return sb.String(), nil
+	},
+}

server/functions/framework/c_function.go

@@ -69,6 +69,12 @@ func (cFunc CFunction) NonDeterministic() bool {
 	return cFunc.IsNonDeterministic
 }
 
+// IsCVariadic implements the FunctionInterface interface.
+func (cFunc CFunction) IsCVariadic() bool {
+	// TODO: implement c-language variadic
+	return false
+}
+
 // VariadicIndex implements the interface FunctionInterface.
 func (cFunc CFunction) VariadicIndex() int {
 	// TODO: implement variadic

server/functions/framework/catalog.go

@@ -48,9 +48,15 @@ func RegisterFunction(f FunctionInterface) {
 	case Function1:
 		name := strings.ToLower(f.Name)
 		Catalog[name] = append(Catalog[name], f)
+	case Function1N:
+		name := strings.ToLower(f.Name)
+		Catalog[name] = append(Catalog[name], f)
 	case Function2:
 		name := strings.ToLower(f.Name)
 		Catalog[name] = append(Catalog[name], f)
+	case Function2N:
+		name := strings.ToLower(f.Name)
+		Catalog[name] = append(Catalog[name], f)
 	case Function3:
 		name := strings.ToLower(f.Name)
 		Catalog[name] = append(Catalog[name], f)

server/functions/framework/compiled_function.go

@@ -104,14 +104,15 @@ func newCompiledFunctionInternal(
 
 	// Then we'll handle the polymorphic types
 	// https://www.postgresql.org/docs/15/extend-type-system.html#EXTEND-TYPES-POLYMORPHIC
-	functionParameterTypes := fn.GetParameters()
-	c.callResolved = make([]*pgtypes.DoltgresType, len(functionParameterTypes)+1)
+	c.callResolved = make([]*pgtypes.DoltgresType, len(overload.params.paramTypes)+1)
 	hasPolymorphicParam := false
-	for i, param := range functionParameterTypes {
+	for i, param := range overload.params.paramTypes {
 		if param.IsPolymorphicType() {
 			// resolve will ensure that the parameter types are valid, so we can just assign them here
 			hasPolymorphicParam = true
 			c.callResolved[i] = originalTypes[i]
+		} else if param.ID == pgtypes.Any.ID {
+			c.callResolved[i] = originalTypes[i]
 		} else if i < len(args) {
 			if d, ok := args[i].Type().(*pgtypes.DoltgresType); ok {
 				// `param` is a default type which does not have type modifier set
@@ -124,7 +125,7 @@ func newCompiledFunctionInternal(
 	c.callResolved[len(c.callResolved)-1] = returnType
 	if returnType.IsPolymorphicType() {
 		if hasPolymorphicParam {
-			c.callResolved[len(c.callResolved)-1] = c.resolvePolymorphicReturnType(functionParameterTypes, originalTypes, returnType)
+			c.callResolved[len(c.callResolved)-1] = c.resolvePolymorphicReturnType(overload.params.paramTypes, originalTypes, returnType)
 		} else if c.Name == "array_in" || c.Name == "array_recv" || c.Name == "enum_in" || c.Name == "enum_recv" || c.Name == "anyenum_in" || c.Name == "anyenum_recv" {
 			// The return type should resolve to the type of OID value passed in as second argument.
 			// TODO: Possible that the oid type has a special property with polymorphic return types,
@@ -266,26 +267,28 @@ func (c *CompiledFunction) Eval(ctx *sql.Context, row sql.Row) (interface{}, err
 	var err error
 	isStrict := c.overload.Function().IsStrict()
 	args := make([]any, len(c.Arguments))
+	exprTypes := make([]*pgtypes.DoltgresType, len(args))
 	for i, arg := range c.Arguments {
 		args[i], err = arg.Eval(ctx, row)
 		if err != nil {
 			return nil, err
 		}
-		// TODO: once we remove GMS types from all of our expressions, we can remove this step which ensures the correct type
-		if _, ok := arg.Type().(*pgtypes.DoltgresType); !ok {
+		var ok bool
+		if exprTypes[i], ok = arg.Type().(*pgtypes.DoltgresType); !ok {
 			dt, err := pgtypes.FromGmsTypeToDoltgresType(arg.Type())
 			if err != nil {
 				return nil, err
 			}
 			args[i], _, _ = dt.Convert(ctx, args[i])
+			exprTypes[i] = dt
 		}
 		if args[i] == nil && isStrict {
 			return nil, nil
 		}
 	}
 
 	if len(c.overload.casts) > 0 {
-		targetParamTypes := c.overload.Function().GetParameters()
+		targetParamTypes := c.overload.params.paramTypes
 		for i, arg := range args {
 			// For variadic params, we need to identify the corresponding target type
 			var targetType *pgtypes.DoltgresType
@@ -320,8 +323,12 @@ func (c *CompiledFunction) Eval(ctx *sql.Context, row sql.Row) (interface{}, err
 		return f.Callable(ctx)
 	case Function1:
 		return f.Callable(ctx, ([2]*pgtypes.DoltgresType)(c.callResolved), args[0])
+	case Function1N:
+		return f.Callable(ctx, c.callResolved, args[0], args[1:])
 	case Function2:
 		return f.Callable(ctx, ([3]*pgtypes.DoltgresType)(c.callResolved), args[0], args[1])
+	case Function2N:
+		return f.Callable(ctx, c.callResolved, args[0], args[1], args[2:])
 	case Function3:
 		return f.Callable(ctx, ([4]*pgtypes.DoltgresType)(c.callResolved), args[0], args[1], args[2])
 	case Function4: