fix(compiler): fix typename comparison in function overloading

sqlc-dev · Nov 25, 2024 · bdeb45d · bdeb45d
1 parent 0b952b4
commit bdeb45d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/internal/endtoend/testdata/ddl_create_function_types/postgresql/pgx/v4/schema.sql b/internal/endtoend/testdata/ddl_create_function_types/postgresql/pgx/v4/schema.sql
@@ -1,2 +1,3 @@
 CREATE FUNCTION foo(bar TEXT) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar TEXT[]) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
 CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT 'baz' $$ LANGUAGE sql;
diff --git a/internal/endtoend/testdata/ddl_create_function_types/postgresql/pgx/v5/schema.sql b/internal/endtoend/testdata/ddl_create_function_types/postgresql/pgx/v5/schema.sql
@@ -1,2 +1,3 @@
 CREATE FUNCTION foo(bar TEXT) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
+CREATE FUNCTION foo(bar TEXT[]) RETURNS bool AS $$ SELECT true $$ LANGUAGE sql;
 CREATE FUNCTION foo(bar INTEGER) RETURNS TEXT AS $$ SELECT 'baz' $$ LANGUAGE sql;
diff --git a/internal/engine/postgresql/parse.go b/internal/engine/postgresql/parse.go
@@ -498,16 +498,21 @@ func translate(node *nodes.Node) (ast.Node, error) {
 		for _, item := range n.Parameters {
 			arg := item.Node.(*nodes.Node_FunctionParameter).FunctionParameter
 			rel, err := parseRelationFromNodes(arg.ArgType.Names)
+
+			relType := rel.TypeName()
+			relType.ArrayBounds = convertSlice(arg.ArgType.ArrayBounds)
+
 			if err != nil {
 				return nil, err
 			}
 			mode, err := convertFuncParamMode(arg.Mode)
 			if err != nil {
 				return nil, err
 			}
+
 			fp := &ast.FuncParam{
 				Name: &arg.Name,
-				Type: rel.TypeName(),
+				Type: relType,
 				Mode: mode,
 			}
 			if arg.Defexpr != nil {

diff --git a/internal/sql/catalog/types.go b/internal/sql/catalog/types.go
@@ -39,6 +39,13 @@ func (ct *CompositeType) SetComment(c string) {
 	ct.Comment = c
 }
 
+func arrayDims(n *ast.TypeName) int {
+	if n == nil || n.ArrayBounds == nil {
+		return 0
+	}
+	return len(n.ArrayBounds.Items)
+}
+
 func sameType(a, b *ast.TypeName) bool {
 	if a.Catalog != b.Catalog {
 		return false
@@ -59,6 +66,9 @@ func sameType(a, b *ast.TypeName) bool {
 	if a.Name != b.Name {
 		return false
 	}
+	if arrayDims(a) != arrayDims(b) {
+		return false
+	}
 	return true
 }