Branch: refs/heads/8.4.x Home: https://github.com/teiid/teiid Commit: 7eee9e2f281d3dce607469864ada9fc1aa7548d8 https://github.com/teiid/teiid/commit/7eee9e2f281d3dce607469864ada9fc1aa7... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2014-02-06 (Thu, 06 Feb 2014) Changed paths: M api/src/main/java/org/teiid/metadata/ForeignKey.java M connectors/translator-jpa/src/main/java/org/teiid/translator/jpa/JPQLSelectVisitor.java M connectors/translator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDocument.java M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataEntitySchemaBuilder.java M engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java M engine/src/test/java/org/teiid/query/parser/TestDDLParser.java M odata/src/main/java/org/teiid/odata/ODataAggregateAnyBuilder.java M odata/src/main/java/org/teiid/odata/ODataSQLBuilder.java Log Message: ----------- TEIID-2656: The designer based VDBs does not set the reference table name on the ForeignKey, they only set the Primary Key, thus the OData metadata call was failing to resolve the Foreign keys and throwing up an exception. Fixed such that in obsence of Reference table name, if PK is present the value will be derived from it, also pulled Steve's commit to fix NPE Conflicts: odata/src/test/java/org/teiid/odata/TestODataIntegration.java Conflicts: odata/src/main/java/org/teiid/odata/ODataEntitySchemaBuilder.java odata/src/main/java/org/teiid/odata/ODataSQLBuilder.java odata/src/test/java/org/teiid/odata/TestODataIntegration.java