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 2012/11/09 19:59:37 UTC

svn commit: r1407593 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/ framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/

Author: aadamchik
Date: Fri Nov  9 18:59:36 2012
New Revision: 1407593

URL: http://svn.apache.org/viewvc?rev=1407593&view=rev
Log:
CAY-1764 cdbimport improvements: "overwrite" flag

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
    cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1407593&r1=1407592&r2=1407593&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Nov  9 18:59:36 2012
@@ -28,6 +28,7 @@ CAY-1760 cdbimport improvements: Default
 CAY-1761 cdbimport improvements: DbLoader must reverse engineer PK auto-increment state. 
 CAY-1762 cdbimport improvements: Support for "defaultPackage" parameter, as the new DataMaps ends up placing entities in the root package 
 CAY-1763 cdbimport improvements: specified "schema" should become the default schema of the generated DataMap 
+CAY-1764 cdbimport improvements: "overwrite" flag
 
 Bug Fixes:
 

Modified: cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java?rev=1407593&r1=1407592&r2=1407593&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java (original)
+++ cayenne/main/trunk/framework/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java Fri Nov  9 18:59:36 2012
@@ -23,14 +23,12 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Driver;
 
-import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.access.AbstractDbLoaderDelegate;
 import org.apache.cayenne.access.DbLoader;
 import org.apache.cayenne.conn.DriverDataSource;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.naming.NamingStrategy;
@@ -43,8 +41,7 @@ import org.xml.sax.InputSource;
 
 public class DbImporterTask extends CayenneTask {
 
-    // DbImporter options.
-    private boolean overwriteExisting = true;
+    private boolean overwrite = true;
 
     /**
      * @deprecated since 3.2 in favor of "schema"
@@ -77,10 +74,10 @@ public class DbImporterTask extends Caye
                 driver, url, userName, password), Project.MSG_VERBOSE);
 
         log(String.format(
-                "importer options - [map: %s, overwriteExisting: %s, schema: %s, tablePattern: %s, importProcedures: %s, procedurePattern: %s, meaningfulPk: %s, namingStrategy: %s]",
-                map, overwriteExisting, getSchema(), tablePattern,
-                importProcedures, procedurePattern, meaningfulPk,
-                namingStrategy), Project.MSG_VERBOSE);
+                "importer options - [map: %s, overwrite: %s, schema: %s, tablePattern: %s, importProcedures: %s, procedurePattern: %s, meaningfulPk: %s, namingStrategy: %s]",
+                map, overwrite, getSchema(), tablePattern, importProcedures,
+                procedurePattern, meaningfulPk, namingStrategy),
+                Project.MSG_VERBOSE);
 
         validateAttributes();
 
@@ -94,9 +91,10 @@ public class DbImporterTask extends Caye
             DbAdapter adapter = getAdapter(injector, dataSource);
 
             // Load the data map and run the db importer.
-            final LoaderDelegate loaderDelegate = new LoaderDelegate();
-            final DbLoader loader = new DbLoader(dataSource.getConnection(),
-                    adapter, loaderDelegate);
+            AbstractDbLoaderDelegate loaderDelegate = new AbstractDbLoaderDelegate() {
+            };
+            DbLoader loader = new DbLoader(dataSource.getConnection(), adapter,
+                    loaderDelegate);
             loader.setCreatingMeaningfulPK(meaningfulPk);
 
             if (namingStrategy != null) {
@@ -151,7 +149,17 @@ public class DbImporterTask extends Caye
 
         if (map.exists()) {
             InputSource in = new InputSource(map.getCanonicalPath());
-            return new MapLoader().loadDataMap(in);
+            dataMap = new MapLoader().loadDataMap(in);
+
+            if (overwrite) {
+                dataMap.clearObjEntities();
+                dataMap.clearEmbeddables();
+                dataMap.clearProcedures();
+                dataMap.clearDbEntities();
+                dataMap.clearQueries();
+                dataMap.clearResultSets();
+            }
+
         } else {
             dataMap = new DataMap();
         }
@@ -198,8 +206,11 @@ public class DbImporterTask extends Caye
         }
     }
 
-    public void setOverwriteExisting(boolean overwriteExisting) {
-        this.overwriteExisting = overwriteExisting;
+    /**
+     * @since 3.2
+     */
+    public void setOverwrite(boolean overwrite) {
+        this.overwrite = overwrite;
     }
 
     /**
@@ -248,37 +259,4 @@ public class DbImporterTask extends Caye
 
         return schema != null ? schema : schemaName;
     }
-
-    final class LoaderDelegate extends AbstractDbLoaderDelegate {
-
-        @Override
-        public boolean overwriteDbEntity(final DbEntity ent)
-                throws CayenneException {
-            return overwriteExisting;
-        }
-
-        @Override
-        public void dbEntityAdded(final DbEntity ent) {
-            super.dbEntityAdded(ent);
-            log("Added DB entity: " + ent.getName());
-        }
-
-        @Override
-        public void dbEntityRemoved(final DbEntity ent) {
-            super.dbEntityRemoved(ent);
-            log("Removed DB entity: " + ent.getName());
-        }
-
-        @Override
-        public void objEntityAdded(final ObjEntity ent) {
-            super.objEntityAdded(ent);
-            log("Added obj entity: " + ent.getName());
-        }
-
-        @Override
-        public void objEntityRemoved(final ObjEntity ent) {
-            super.objEntityRemoved(ent);
-            log("Removed obj entity: " + ent.getName());
-        }
-    }
 }

Modified: cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java?rev=1407593&r1=1407592&r2=1407593&view=diff
==============================================================================
--- cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java (original)
+++ cayenne/main/trunk/framework/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java Fri Nov  9 18:59:36 2012
@@ -26,7 +26,6 @@ import java.sql.Driver;
 
 import javax.sql.DataSource;
 
-import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.access.AbstractDbLoaderDelegate;
 import org.apache.cayenne.access.DbLoader;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
@@ -37,7 +36,6 @@ import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.MapLoader;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.naming.NamingStrategy;
@@ -78,16 +76,13 @@ public class DbImporterMojo extends Abst
     private String defaultPackage;
 
     /**
-     * Indicates whether existing DB and object entities should be overwritten.
-     * This is an all-or-nothing setting. If you need finer granularity, please
-     * use the Cayenne Modeler.
+     * Indicates that the old mapping should be completely removed and replaced
+     * with the new data based on reverse engineering. Default is
+     * <code>true</code>.
      * 
-     * Default is <code>true</code>.
-     * 
-     * @parameter expression="${cdbimport.overwriteExisting}"
-     *            default-value="true"
+     * @parameter expression="${cdbimport.overwrite}" default-value="true"
      */
-    private boolean overwriteExisting;
+    private boolean overwrite;
 
     /**
      * DB schema to use for DB importing.
@@ -213,8 +208,8 @@ public class DbImporterMojo extends Abst
 
         getLog().info(
                 String.format(
-                        "importer options - [map: %s, overwriteExisting: %s, schema: %s, tablePattern: %s, importProcedures: %s, procedurePattern: %s, meaningfulPk: %s, namingStrategy: %s]",
-                        map, overwriteExisting, getSchema(), tablePattern,
+                        "importer options - [map: %s, overwrite: %s, schema: %s, tablePattern: %s, importProcedures: %s, procedurePattern: %s, meaningfulPk: %s, namingStrategy: %s]",
+                        map, overwrite, getSchema(), tablePattern,
                         importProcedures, procedurePattern, meaningfulPk,
                         namingStrategy));
 
@@ -247,9 +242,10 @@ public class DbImporterMojo extends Abst
         DbAdapter adapter = getAdapter(injector, dataSource);
 
         // Load the data map and run the db importer.
-        final LoaderDelegate loaderDelegate = new LoaderDelegate();
-        final DbLoader loader = new DbLoader(dataSource.getConnection(),
-                adapter, loaderDelegate);
+        AbstractDbLoaderDelegate loaderDelegate = new AbstractDbLoaderDelegate() {
+        };
+        DbLoader loader = new DbLoader(dataSource.getConnection(), adapter,
+                loaderDelegate);
         loader.setCreatingMeaningfulPK(meaningfulPk);
 
         if (namingStrategy != null) {
@@ -289,7 +285,16 @@ public class DbImporterMojo extends Abst
 
         if (map.exists()) {
             InputSource in = new InputSource(map.getCanonicalPath());
-            return new MapLoader().loadDataMap(in);
+            dataMap = new MapLoader().loadDataMap(in);
+
+            if (overwrite) {
+                dataMap.clearObjEntities();
+                dataMap.clearEmbeddables();
+                dataMap.clearProcedures();
+                dataMap.clearDbEntities();
+                dataMap.clearQueries();
+                dataMap.clearResultSets();
+            }
         } else {
             dataMap = new DataMap();
         }
@@ -333,31 +338,4 @@ public class DbImporterMojo extends Abst
         return schema != null ? schema : schemaName;
     }
 
-    final class LoaderDelegate extends AbstractDbLoaderDelegate {
-
-        public boolean overwriteDbEntity(final DbEntity ent)
-                throws CayenneException {
-            return overwriteExisting;
-        }
-
-        public void dbEntityAdded(final DbEntity ent) {
-            super.dbEntityAdded(ent);
-            getLog().info("Added DB entity: " + ent.getName());
-        }
-
-        public void dbEntityRemoved(final DbEntity ent) {
-            super.dbEntityRemoved(ent);
-            getLog().info("Removed DB entity: " + ent.getName());
-        }
-
-        public void objEntityAdded(final ObjEntity ent) {
-            super.objEntityAdded(ent);
-            getLog().info("Added obj entity: " + ent.getName());
-        }
-
-        public void objEntityRemoved(final ObjEntity ent) {
-            super.objEntityRemoved(ent);
-            getLog().info("Removed obj entity: " + ent.getName());
-        }
-    }
 }