When creating functions within a schema, those functions could not be used in…

When creating functions within a schema, those functions could not be used in views, nested queries, and constraints.

h2/src/main/org/h2/expression/JavaFunction.java

@@ -7,6 +7,8 @@
 package org.h2.expression;
 
 import org.h2.command.Parser;
+import org.h2.constant.SysProperties;
+import org.h2.engine.Constants;
 import org.h2.engine.FunctionAlias;
 import org.h2.engine.Session;
 import org.h2.table.ColumnResolver;
@@ -81,6 +83,11 @@ public class JavaFunction extends Expression implements FunctionCall {
 
     public String getSQL() {
         StatementBuilder buff = new StatementBuilder();
+        // TODO always append the schema once FUNCTIONS_IN_SCHEMA is enabled
+        if (SysProperties.FUNCTIONS_IN_SCHEMA || 
+                !functionAlias.getSchema().equals(Constants.SCHEMA_MAIN)) {
+            buff.append(Parser.quoteIdentifier(functionAlias.getSchema().getName())).append('.');
+        }
         buff.append(Parser.quoteIdentifier(functionAlias.getName())).append('(');
         for (Expression e : args) {
             buff.appendExceptFirst(", ");

h2/src/test/org/h2/test/db/TestFunctions.java

@@ -48,6 +48,7 @@ public class TestFunctions extends TestBase implements AggregateFunction {
 
     public void test() throws Exception {
         deleteDb("functions");
+        testFunctionInSchema();
         testGreatest();
         testSource();
         testDynamicArgumentAndReturn();
@@ -65,6 +66,24 @@ public class TestFunctions extends TestBase implements AggregateFunction {
         FileSystem.getInstance(TEMP_DIR).deleteRecursive(TEMP_DIR, true);
     }
     
+    private void testFunctionInSchema() throws SQLException {
+        Connection conn = getConnection("functions");
+        Statement stat = conn.createStatement();
+
+        stat.execute("create schema schema2");
+        stat.execute("create alias schema2.func as 'int x() { return 1; }'");
+        stat.execute("create view test as select schema2.func()");
+        ResultSet rs;
+        rs = stat.executeQuery("select * from information_schema.views");
+        rs.next();
+        assertTrue(rs.getString("VIEW_DEFINITION").indexOf("SCHEMA2.FUNC") >= 0);
+
+        stat.execute("drop view test");
+        stat.execute("drop schema schema2");
+
+        conn.close();
+    }
+
     private void testGreatest() throws SQLException {
         Connection conn = getConnection("functions");
         Statement stat = conn.createStatement();