fix: issue-96 function name incorrect (#97)

mbwhite · web-flow · commit aa48c3118b14 · 2025-10-08T20:14:54.000+02:00
The function name was being copied directly to the output structure
whereas it should have been created from the `__str__` on the function
object.

---------

Signed-off-by: MBWhite &lt;whitemat@uk.ibm.com&gt;
diff --git a/src/substrait/builders/extended_expression.py b/src/substrait/builders/extended_expression.py
@@ -240,7 +240,7 @@ def resolve(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
                     extension_uri_reference=registry.lookup_uri(uri),
                     function_anchor=func[0].anchor,
-                    name=function,
+                    name=str(func[0]),
                 )
             )
         ]
@@ -320,7 +320,7 @@ def resolve(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
                     extension_uri_reference=registry.lookup_uri(uri),
                     function_anchor=func[0].anchor,
-                    name=function,
+                    name=str(func[0]),
                 )
             )
         ]
@@ -402,7 +402,7 @@ def resolve(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
                     extension_uri_reference=registry.lookup_uri(uri),
                     function_anchor=func[0].anchor,
-                    name=function,
+                    name=str(func[0]),
                 )
             )
         ]
diff --git a/tests/builders/extended_expression/test_aggregate_function.py b/tests/builders/extended_expression/test_aggregate_function.py
@@ -59,7 +59,7 @@ def test_aggregate_count():
         extensions=[
             ste.SimpleExtensionDeclaration(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
-                    extension_uri_reference=1, function_anchor=1, name="count"
+                    extension_uri_reference=1, function_anchor=1, name="count:any"
                 )
             )
         ],
diff --git a/tests/builders/extended_expression/test_scalar_function.py b/tests/builders/extended_expression/test_scalar_function.py
@@ -68,7 +68,7 @@ def test_sclar_add():
         extensions=[
             ste.SimpleExtensionDeclaration(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
-                    extension_uri_reference=1, function_anchor=1, name="test_func"
+                    extension_uri_reference=1, function_anchor=1, name="test_func:i8"   
                 )
             )
         ],
@@ -139,12 +139,12 @@ def test_nested_scalar_calls():
         extensions=[
             ste.SimpleExtensionDeclaration(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
-                    extension_uri_reference=1, function_anchor=2, name="is_positive"
+                    extension_uri_reference=1, function_anchor=2, name="is_positive:i8"
                 )
             ),
             ste.SimpleExtensionDeclaration(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
-                    extension_uri_reference=1, function_anchor=1, name="test_func"
+                    extension_uri_reference=1, function_anchor=1, name="test_func:i8"
                 )
             ),
         ],
diff --git a/tests/builders/extended_expression/test_window_function.py b/tests/builders/extended_expression/test_window_function.py
@@ -55,7 +55,7 @@ def test_row_number():
         extensions=[
             ste.SimpleExtensionDeclaration(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
-                    extension_uri_reference=1, function_anchor=1, name="row_number"
+                    extension_uri_reference=1, function_anchor=1, name="row_number:"
                 )
             )
         ],
diff --git a/tests/builders/plan/test_aggregate.py b/tests/builders/plan/test_aggregate.py
@@ -52,7 +52,7 @@ def test_aggregate():
         extensions=[
             ste.SimpleExtensionDeclaration(
                 extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(
-                    extension_uri_reference=1, function_anchor=1, name="count"
+                    extension_uri_reference=1, function_anchor=1, name="count:any"
                 )
             )
         ],

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ def resolve(`
`240`	`240`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`241`	`241`	`extension_uri_reference=registry.lookup_uri(uri),`
`242`	`242`	`function_anchor=func[0].anchor,`
`243`		`- name=function,`
	`243`	`+ name=str(func[0]),`
`244`	`244`	`)`
`245`	`245`	`)`
`246`	`246`	`]`
`@@ -320,7 +320,7 @@ def resolve(`
`320`	`320`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`321`	`321`	`extension_uri_reference=registry.lookup_uri(uri),`
`322`	`322`	`function_anchor=func[0].anchor,`
`323`		`- name=function,`
	`323`	`+ name=str(func[0]),`
`324`	`324`	`)`
`325`	`325`	`)`
`326`	`326`	`]`
`@@ -402,7 +402,7 @@ def resolve(`
`402`	`402`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`403`	`403`	`extension_uri_reference=registry.lookup_uri(uri),`
`404`	`404`	`function_anchor=func[0].anchor,`
`405`		`- name=function,`
	`405`	`+ name=str(func[0]),`
`406`	`406`	`)`
`407`	`407`	`)`
`408`	`408`	`]`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ def test_aggregate_count():`
`59`	`59`	`extensions=[`
`60`	`60`	`ste.SimpleExtensionDeclaration(`
`61`	`61`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`62`		`- extension_uri_reference=1, function_anchor=1, name="count"`
	`62`	`+ extension_uri_reference=1, function_anchor=1, name="count:any"`
`63`	`63`	`)`
`64`	`64`	`)`
`65`	`65`	`],`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ def test_sclar_add():`
`68`	`68`	`extensions=[`
`69`	`69`	`ste.SimpleExtensionDeclaration(`
`70`	`70`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`71`		`- extension_uri_reference=1, function_anchor=1, name="test_func"`
	`71`	`+ extension_uri_reference=1, function_anchor=1, name="test_func:i8"`
`72`	`72`	`)`
`73`	`73`	`)`
`74`	`74`	`],`
`@@ -139,12 +139,12 @@ def test_nested_scalar_calls():`
`139`	`139`	`extensions=[`
`140`	`140`	`ste.SimpleExtensionDeclaration(`
`141`	`141`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`142`		`- extension_uri_reference=1, function_anchor=2, name="is_positive"`
	`142`	`+ extension_uri_reference=1, function_anchor=2, name="is_positive:i8"`
`143`	`143`	`)`
`144`	`144`	`),`
`145`	`145`	`ste.SimpleExtensionDeclaration(`
`146`	`146`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`147`		`- extension_uri_reference=1, function_anchor=1, name="test_func"`
	`147`	`+ extension_uri_reference=1, function_anchor=1, name="test_func:i8"`
`148`	`148`	`)`
`149`	`149`	`),`
`150`	`150`	`],`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ def test_row_number():`
`55`	`55`	`extensions=[`
`56`	`56`	`ste.SimpleExtensionDeclaration(`
`57`	`57`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`58`		`- extension_uri_reference=1, function_anchor=1, name="row_number"`
	`58`	`+ extension_uri_reference=1, function_anchor=1, name="row_number:"`
`59`	`59`	`)`
`60`	`60`	`)`
`61`	`61`	`],`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ def test_aggregate():`
`52`	`52`	`extensions=[`
`53`	`53`	`ste.SimpleExtensionDeclaration(`
`54`	`54`	`extension_function=ste.SimpleExtensionDeclaration.ExtensionFunction(`
`55`		`- extension_uri_reference=1, function_anchor=1, name="count"`
	`55`	`+ extension_uri_reference=1, function_anchor=1, name="count:any"`
`56`	`56`	`)`
`57`	`57`	`)`
`58`	`58`	`],`