[bugfix] Fix arity in XQuery error when there are duplicate functions in

a main module
Closes #3790

Author: adamretter

exist-core/src/main/java/org/exist/xquery/XQueryContext.java

@@ -1717,9 +1717,10 @@ public void declareFunction(final UserDefinedFunction function) throws XPathExce
             throw new XPathException(function, ErrorCodes.XQST0060, "Every declared function name must have a non-null namespace URI, but function '" + name + "' does not meet this requirement.");
         }
 
-        final FunctionId functionKey = function.getSignature().getFunctionId();
+        final FunctionSignature signature = function.getSignature();
+        final FunctionId functionKey = signature.getFunctionId();
         if (declaredFunctions.containsKey(functionKey)) {
-            throw new XPathException(ErrorCodes.XQST0034, "Function " + function.getName() + "#" + function.getArgumentCount() + " is already defined.");
+            throw new XPathException(ErrorCodes.XQST0034, "Function " +  signature.getName().toURIQualifiedName() + '#' + signature.getArgumentCount() + " is already defined.");
         } else {
             declaredFunctions.put(functionKey, function);
         }

exist-core/src/test/java/org/exist/xquery/ImportModuleTest.java

@@ -532,6 +532,98 @@ public void functionSameAsOtherModule() throws EXistException, IOException, Perm
                 transaction.commit();
 
                 assertEquals(ErrorCodes.XQST0034, e.getErrorCode());
+                assertTrue(e.getMessage().contains("{http://example.com/impl}f1#1"));
+            }
+        }
+    }
+
+    /**
+     * Checks that XQST0034 is raised if a main module contains two functions of the same name and arity.
+     */
+    @Test
+    public void functionDuplicateInMainModule() throws EXistException, IOException, PermissionDeniedException, LockException, TriggerException, XPathException {
+        final String query =
+                        "declare function local:f1($a as xs:string) as xs:string {\n" +
+                        "    <first>{$a}</first>\n" +
+                        "};\n" +
+                        "\n" +
+                        "declare function local:f1($a as xs:string) as xs:string {\n" +
+                        "    <second>{$a}</second>\n" +
+                        "};\n" +
+                        "\n" +
+                        "<result>\n" +
+                        "    <impl1>{local:f1(\"to impl1\")}</impl1>" +
+                        "    <impl2>{local:f1(\"to impl1\")}</impl2>" +
+                        "</result>\n";
+
+        final BrokerPool pool = existEmbeddedServer.getBrokerPool();
+        final Source source = new StringSource(query);
+        try (final DBBroker broker = pool.get(Optional.of(pool.getSecurityManager().getSystemSubject()));
+             final Txn transaction = pool.getTransactionManager().beginTransaction()) {
+
+            // execute query
+            try {
+                final Tuple2<XQueryContext, Sequence> contextAndResult = withCompiledQuery(broker, source, compiledXQuery -> {
+                    final Sequence result = executeQuery(broker, compiledXQuery);
+                    return Tuple(compiledXQuery.getContext(), result);
+                });
+
+                transaction.commit();
+
+                fail("expected XQST0034");
+
+            } catch (final XPathException e) {
+                transaction.commit();
+
+                assertEquals(ErrorCodes.XQST0034, e.getErrorCode());
+                assertTrue(e.getMessage().contains("{http://www.w3.org/2005/xquery-local-functions}f1#1"));
+            }
+        }
+    }
+
+    /**
+     * Checks that XQST0034 is raised if a main module contains two functions of the same name and arity.
+     */
+    @Test
+    public void functionDuplicateNsInMainModule() throws EXistException, IOException, PermissionDeniedException, LockException, TriggerException, XPathException {
+        final String query =
+                "declare namespace ns1 = 'http://ns1';\n" +
+                "declare namespace ns12 = 'http://ns1';\n" +
+                "\n" +
+                "declare function ns1:f1($a as xs:string) as xs:string {\n" +
+                        "    <first>{$a}</first>\n" +
+                        "};\n" +
+                        "\n" +
+                        "declare function ns12:f1($a as xs:string) as xs:string {\n" +
+                        "    <second>{$a}</second>\n" +
+                        "};\n" +
+                        "\n" +
+                        "<result>\n" +
+                        "    <impl1>{ns1:f1(\"to impl1\")}</impl1>" +
+                        "    <impl2>{ns12:f1(\"to impl1\")}</impl2>" +
+                        "</result>\n";
+
+        final BrokerPool pool = existEmbeddedServer.getBrokerPool();
+        final Source source = new StringSource(query);
+        try (final DBBroker broker = pool.get(Optional.of(pool.getSecurityManager().getSystemSubject()));
+             final Txn transaction = pool.getTransactionManager().beginTransaction()) {
+
+            // execute query
+            try {
+                final Tuple2<XQueryContext, Sequence> contextAndResult = withCompiledQuery(broker, source, compiledXQuery -> {
+                    final Sequence result = executeQuery(broker, compiledXQuery);
+                    return Tuple(compiledXQuery.getContext(), result);
+                });
+
+                transaction.commit();
+
+                fail("expected XQST0034");
+
+            } catch (final XPathException e) {
+                transaction.commit();
+
+                assertEquals(ErrorCodes.XQST0034, e.getErrorCode());
+                assertTrue(e.getMessage().contains("{http://ns1}f1#1"));
             }
         }
     }
@@ -583,6 +675,7 @@ public void functionSameAsImportingModule() throws EXistException, IOException,
                 transaction.commit();
 
                 assertEquals(ErrorCodes.XQST0034, e.getErrorCode());
+                assertTrue(e.getMessage().contains("{http://example.com/impl}f1#1"));
             }
         }
     }