allowing tests to use functions declared on the schemas

teiid · Nov 21, 2018 · 8124d2a · 8124d2a
1 parent e6c1663
commit 8124d2a
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java b/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
@@ -16,6 +16,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -26,10 +27,11 @@
 import org.teiid.adminapi.impl.VDBMetadataParser;
 import org.teiid.core.TeiidRuntimeException;
 import org.teiid.core.util.LRUCache;
-import org.teiid.metadata.FunctionMethod;
 import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.Schema;
 import org.teiid.query.function.FunctionTree;
 import org.teiid.query.function.SystemFunctionManager;
+import org.teiid.query.function.UDFSource;
 import org.teiid.query.metadata.CompositeMetadataStore;
 import org.teiid.query.metadata.PureZipFileSystem;
 import org.teiid.query.metadata.SystemMetadata;
@@ -69,8 +71,19 @@ public static TransformationMetadata getVDBMetadata(String vdbName, URL vdbURL)
 			if (r != null) {
 				vdb = VDBMetadataParser.unmarshell(r.openStream());
 			}
-			Collection <FunctionMethod> methods = null;
-			Collection<FunctionTree> trees = null;
+			Collection<FunctionTree> trees = new ArrayList<>();
+			for (Schema schema:imf.store.getSchemas().values()) {
+                if (!schema.getFunctions().isEmpty()) {
+                    UDFSource source = new UDFSource(schema.getFunctions().values());
+                    trees.add(new FunctionTree(schema.getName(), source, false));
+                }
+                if (!schema.getProcedures().isEmpty()) {
+                    FunctionTree ft = FunctionTree.getFunctionProcedures(schema);
+                    if (ft != null) {
+                        trees.add(ft);
+                    }
+                }
+            }
 			SystemFunctionManager sfm = SystemMetadata.getInstance().getSystemFunctionManager();
 			vdbmetadata = new TransformationMetadata(vdb, new CompositeMetadataStore(Arrays.asList(SystemMetadata.getInstance().getSystemStore(), imf.store)), imf.resources.getEntriesPlusVisibilities(), sfm.getSystemFunctions(), trees); 
 			VDB_CACHE.put(vdbURL, vdbmetadata);