You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/10/13 20:58:47 UTC
svn commit: r463776 -
/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
Author: aadamchik
Date: Fri Oct 13 11:58:43 2006
New Revision: 463776
URL: http://svn.apache.org/viewvc?view=rev&rev=463776
Log:
CAY-690
Modified:
incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java?view=diff&rev=463776&r1=463775&r2=463776
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java Fri Oct 13 11:58:43 2006
@@ -23,6 +23,7 @@
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DerivedDbEntity;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.event.EntityEvent;
import org.apache.cayenne.map.event.ProcedureEvent;
@@ -73,6 +74,11 @@
Iterator dbEntities = dataMap.getDbEntities().iterator();
while (dbEntities.hasNext()) {
DbEntity entity = (DbEntity) dbEntities.next();
+
+ if(entity instanceof DerivedDbEntity) {
+ continue;
+ }
+
if (doAll || Util.isEmptyString(entity.getSchema())) {
if (!Util.nullSafeEquals(defaultSchema, entity.getSchema())) {
entity.setSchema(defaultSchema);