You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/21 09:59:32 UTC
[1/3] cayenne git commit: CAY-2144 cdbimport always fails for
databases which don't support catalogs (e.g. postgres)
Repository: cayenne
Updated Branches:
refs/heads/master aae4e82a9 -> f52727517
CAY-2144 cdbimport always fails for databases which don't support catalogs (e.g. postgres)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ead663e6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ead663e6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ead663e6
Branch: refs/heads/master
Commit: ead663e62596c0c3f814c0c32cc15f851e0eaff8
Parents: b0d0faf
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 17 18:30:33 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Nov 17 18:30:33 2016 +0300
----------------------------------------------------------------------
.../tools/DbImportConfigurationValidator.java | 87 ++++++++++++++++++++
.../apache/cayenne/tools/DbImporterTask.java | 47 ++++-------
.../apache/cayenne/tools/DbImporterMojo.java | 37 ++-------
3 files changed, 114 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ead663e6/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImportConfigurationValidator.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImportConfigurationValidator.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImportConfigurationValidator.java
new file mode 100644
index 0000000..888fca2
--- /dev/null
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImportConfigurationValidator.java
@@ -0,0 +1,87 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.tools;
+
+import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.server.DataSourceFactory;
+import org.apache.cayenne.configuration.server.DbAdapterFactory;
+import org.apache.cayenne.dba.DbAdapter;
+import org.apache.cayenne.dbimport.Catalog;
+import org.apache.cayenne.dbimport.ReverseEngineering;
+import org.apache.cayenne.di.Injector;
+import org.apache.cayenne.tools.dbimport.DbImportConfiguration;
+
+import java.util.Collection;
+import javax.sql.DataSource;
+
+class DbImportConfigurationValidator implements Cloneable {
+ private final ReverseEngineering reverseEngineering;
+ private final DbImportConfiguration config;
+ private final Injector injector;
+
+ DbImportConfigurationValidator(ReverseEngineering reverseEngineering, DbImportConfiguration config, Injector injector) {
+ this.reverseEngineering = reverseEngineering;
+ this.config = config;
+ this.injector = injector;
+ }
+
+ void validate() throws Exception {
+ DataNodeDescriptor dataNodeDescriptor = config.createDataNodeDescriptor();
+ DataSource dataSource;
+ DbAdapter adapter;
+
+ try {
+ dataSource = injector.getInstance(DataSourceFactory.class)
+ .getDataSource(dataNodeDescriptor);
+ adapter = injector.getInstance(DbAdapterFactory.class)
+ .createAdapter(dataNodeDescriptor, dataSource);
+ } catch (Exception ex) {
+ throw new Exception("Error creating DataSource or DbAdapter " +
+ "for DataNodeDescriptor (" + dataNodeDescriptor + ")", ex);
+ }
+
+ if (adapter != null
+ && !adapter.supportsCatalogsOnReverseEngineering()
+ && !isReverseEngineeringCatalogsEmpty()) {
+ String message = "Your database does not support catalogs on reverse engineering. " +
+ "It allows to connect to only one at the moment. " +
+ "Please don't note catalogs as param.";
+ throw new Exception(message);
+ }
+ }
+
+ private boolean isReverseEngineeringCatalogsEmpty() {
+ Collection<Catalog> catalogs = reverseEngineering.getCatalogs();
+ if (catalogs == null) {
+ return true;
+ }
+
+ if (catalogs.isEmpty()) {
+ return true;
+ }
+
+ for (Catalog catalog : catalogs) {
+ if (catalog.getName() != null) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ead663e6/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index c8484f7..aa4b631 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -18,12 +18,16 @@
****************************************************************/
package org.apache.cayenne.tools;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
import org.apache.cayenne.conn.DataSourceInfo;
-import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dbimport.*;
+import org.apache.cayenne.dbimport.Catalog;
+import org.apache.cayenne.dbimport.ExcludeColumn;
+import org.apache.cayenne.dbimport.ExcludeProcedure;
+import org.apache.cayenne.dbimport.ExcludeTable;
+import org.apache.cayenne.dbimport.IncludeColumn;
+import org.apache.cayenne.dbimport.IncludeProcedure;
+import org.apache.cayenne.dbimport.IncludeTable;
+import org.apache.cayenne.dbimport.ReverseEngineering;
+import org.apache.cayenne.dbimport.Schema;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.naming.DefaultObjectNameGenerator;
import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder;
@@ -39,7 +43,6 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-import javax.sql.DataSource;
import java.io.File;
public class DbImporterTask extends Task {
@@ -111,9 +114,16 @@ public class DbImporterTask extends Task {
config.setSkipPrimaryKeyLoading(reverseEngineering.getSkipPrimaryKeyLoading());
config.setTableTypes(reverseEngineering.getTableTypes());
- Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger), new DbImportModule());
+ Injector injector = DIBootstrap.createInjector(new DbSyncModule(),
+ new ToolsModule(logger), new DbImportModule());
- validateDbImportConfiguration(config, injector);
+ DbImportConfigurationValidator validator = new DbImportConfigurationValidator(
+ reverseEngineering, config, injector);
+ try {
+ validator.validate();
+ } catch (Exception ex) {
+ throw new BuildException(ex.getMessage(), ex);
+ }
try {
injector.getInstance(DbImportAction.class).execute(config);
@@ -133,27 +143,6 @@ public class DbImporterTask extends Task {
}
}
- private void validateDbImportConfiguration(DbImportConfiguration config, Injector injector) throws BuildException {
- DataNodeDescriptor dataNodeDescriptor = config.createDataNodeDescriptor();
- DataSource dataSource = null;
- DbAdapter adapter = null;
-
- try {
- dataSource = injector.getInstance(DataSourceFactory.class).getDataSource(dataNodeDescriptor);
- adapter = injector.getInstance(DbAdapterFactory.class).createAdapter(dataNodeDescriptor, dataSource);
-
- if (!adapter.supportsCatalogsOnReverseEngineering() &&
- reverseEngineering.getCatalogs() != null && !reverseEngineering.getCatalogs().isEmpty()) {
- String message = "Your database does not support catalogs on reverse engineering. " +
- "It allows to connect to only one at the moment. Please don't note catalogs as param.";
- throw new BuildException(message);
- }
- } catch (Exception e) {
- throw new BuildException("Error creating DataSource ("
- + dataSource + ") or DbAdapter (" + adapter + ") for DataNodeDescriptor (" + dataNodeDescriptor + ")", e);
- }
- }
-
/**
* Validates attributes that are not related to internal
* DefaultClassGenerator. Throws BuildException if attributes are invalid.
http://git-wip-us.apache.org/repos/asf/cayenne/blob/ead663e6/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
----------------------------------------------------------------------
diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
index bf0252b..469798b 100644
--- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
+++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java
@@ -18,10 +18,6 @@
****************************************************************/
package org.apache.cayenne.tools;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.configuration.server.DataSourceFactory;
-import org.apache.cayenne.configuration.server.DbAdapterFactory;
-import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dbimport.ReverseEngineering;
import org.apache.cayenne.dbsync.DbSyncModule;
import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder;
@@ -37,7 +33,6 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import javax.sql.DataSource;
import java.io.File;
/**
@@ -163,9 +158,16 @@ public class DbImporterMojo extends AbstractMojo {
Log logger = new MavenLogger(this);
DbImportConfiguration config = createConfig(logger);
- Injector injector = DIBootstrap.createInjector(new DbSyncModule(), new ToolsModule(logger), new DbImportModule());
+ Injector injector = DIBootstrap.createInjector(
+ new DbSyncModule(), new ToolsModule(logger), new DbImportModule());
- validateDbImportConfiguration(config, injector);
+ DbImportConfigurationValidator validator = new DbImportConfigurationValidator(
+ reverseEngineering, config, injector);
+ try {
+ validator.validate();
+ } catch (Exception ex) {
+ throw new MojoExecutionException(ex.getMessage(), ex);
+ }
try {
injector.getInstance(DbImportAction.class).execute(config);
@@ -183,27 +185,6 @@ public class DbImporterMojo extends AbstractMojo {
}
}
- private void validateDbImportConfiguration(DbImportConfiguration config, Injector injector) throws MojoExecutionException {
- DataNodeDescriptor dataNodeDescriptor = config.createDataNodeDescriptor();
- DataSource dataSource = null;
- DbAdapter adapter = null;
-
- try {
- dataSource = injector.getInstance(DataSourceFactory.class).getDataSource(dataNodeDescriptor);
- adapter = injector.getInstance(DbAdapterFactory.class).createAdapter(dataNodeDescriptor, dataSource);
-
- if (!adapter.supportsCatalogsOnReverseEngineering() &&
- reverseEngineering.getCatalogs() != null && !reverseEngineering.getCatalogs().isEmpty()) {
- String message = "Your database does not support catalogs on reverse engineering. " +
- "It allows to connect to only one at the moment. Please don't note catalogs as param.";
- throw new MojoExecutionException(message);
- }
- } catch (Exception e) {
- throw new MojoExecutionException("Error creating DataSource ("
- + dataSource + ") or DbAdapter (" + adapter + ") for DataNodeDescriptor (" + dataNodeDescriptor + ")", e);
- }
- }
-
DbImportConfiguration createConfig(Log logger) {
DbImportConfiguration config = new DbImportConfiguration();
[2/3] cayenne git commit: CAY-2144 cdbimport always fails for
databases which don't support catalogs (e.g. postgres)
Posted by sk...@apache.org.
CAY-2144 cdbimport always fails for databases which don't support catalogs (e.g. postgres)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0cf662e3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0cf662e3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0cf662e3
Branch: refs/heads/master
Commit: 0cf662e3440e97aef621cfcdb9f72385fb7460ab
Parents: ead663e
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 17 18:34:17 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Nov 17 18:34:17 2016 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/0cf662e3/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index eaca48f..b6e2f8b 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -68,6 +68,7 @@ CAY-2128 Modeler stored procedures are not imported
CAY-2131 Modeler NullPointerException in reverse engineering when importing different catalogs in one datamap
CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml
CAY-2143 NPE in BaseSchemaUpdateStrategy
+CAY-2144 cdbimport always fails for databases which don't support catalogs
----------------------------------
Release: 4.0.M3
[3/3] cayenne git commit: Merge branch '134'
Posted by sk...@apache.org.
Merge branch '134'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f5272751
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f5272751
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f5272751
Branch: refs/heads/master
Commit: f527275176b650a50737cbc3d618838a6ebd3b4b
Parents: aae4e82 0cf662e
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Nov 21 12:54:06 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Nov 21 12:54:06 2016 +0300
----------------------------------------------------------------------
.../tools/DbImportConfigurationValidator.java | 87 ++++++++++++++++++++
.../apache/cayenne/tools/DbImporterTask.java | 47 ++++-------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../apache/cayenne/tools/DbImporterMojo.java | 37 ++-------
4 files changed, 115 insertions(+), 57 deletions(-)
----------------------------------------------------------------------