[teiid-commits] teiid SVN: r4106 - in trunk: jboss-integration/src/main/java/org/teiid/jboss and 1 other directory.
Author: rareddy
Date: 2012-05-15 19:34:40 -0400 (Tue, 15 May 2012)
New Revision: 4106
Modified:
trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
Log:
TEIID-2047: fixing the Schema merge to be correct
Modified: trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2012-05-15
21:26:51 UTC (rev 4105)
+++ trunk/engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java 2012-05-15
23:34:40 UTC (rev 4106)
@@ -174,7 +174,7 @@
if (obj.getUpdateInfo() != null &&
obj.getUpdateInfo().isInherentInsert()) {
try {
if (obj.getUpdateInfo().findInsertUpdateMapping(obj, false) == null) {
- handleValidationError(QueryPlugin.Util.getString("ValidationVisitor.nonUpdatable",
obj.getVariables()), obj); //$NON-NLS-1$
+ handleValidationError(QueryPlugin.Util.gs(QueryPlugin.Event.TEIID30376,
obj.getVariables()), obj);
}
} catch (QueryValidatorException e) {
handleValidationError(e.getMessage(), obj);
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-15
21:26:51 UTC (rev 4105)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-05-15
23:34:40 UTC (rev 4106)
@@ -315,6 +315,8 @@
// designer based models define data types based on their built in data types, which
are system vdb data types
Map<String, Datatype> datatypes =
indexStore?getVDBRepository().getSystemStore().getDatatypes():getVDBRepository().getBuiltinDatatypes();
factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), model.getName(),
datatypes, model.getProperties(), model.getSchemaText());
+ factory.setPhysical(model.isSource());
+ factory.setVisible(model.isVisible());
ExecutionFactory ef = null;
Object cf = null;