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 2007/04/22 17:57:05 UTC

svn commit: r531212 - in /cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler: dialog/db/DBGeneratorOptions.java pref/DBGeneratorDefaults.java

Author: aadamchik
Date: Sun Apr 22 08:57:04 2007
New Revision: 531212

URL: http://svn.apache.org/viewvc?view=rev&rev=531212
Log:
CAY-717: Modeler doesn't manage FK constraints with MYSQL

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java?view=diff&rev=531212&r1=531211&r2=531212
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DBGeneratorOptions.java Sun Apr 22 08:57:04 2007
@@ -147,7 +147,6 @@
             DbAdapter adapter = connectionInfo.makeAdapter(getApplication()
                     .getClassLoadingService());
             this.generator = new DbGenerator(adapter, dataMap, tables.getExcludedTables());
-            this.generatorDefaults.adjustForAdapter(adapter);
         }
         catch (Exception ex) {
             reportError("Error loading adapter", ex);

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java?view=diff&rev=531212&r1=531211&r2=531212
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java Sun Apr 22 08:57:04 2007
@@ -20,19 +20,8 @@
 
 import org.apache.cayenne.PersistenceState;
 import org.apache.cayenne.access.DbGenerator;
-import org.apache.cayenne.dba.DbAdapter;
 
 public class DBGeneratorDefaults extends _DBGeneratorDefaults {
-
-    /**
-     * Updates this object state to provide reasonable defaults for a given adapter.
-     */
-    public void adjustForAdapter(DbAdapter adapter) {
-        if (!adapter.supportsFkConstraints()
-                && booleanForBooleanProperty(CREATE_FK_PROPERTY)) {
-            setCreateFK(Boolean.FALSE);
-        }
-    }
 
     /**
      * Updates DbGenerator settings, consulting its own state.