[cayenne] branch master updated: Fix javadoc generation on java 11
This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git The following commit(s) were added to refs/heads/master by this push: new 68cd011 Fix javadoc generation on java 11 68cd011 is described below commit 68cd011009ee71ed2e27410f7cd0b1cb0f06f873 Author: Arseni Bulatski AuthorDate: Wed Feb 13 10:40:28 2019 +0300 Fix javadoc generation on java 11 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 782f52b..28ab9c8 100644 --- a/pom.xml +++ b/pom.xml @@ -815,6 +815,7 @@ ${javadoc.doclint} ${javadoc.additionalOptions} + 1.8
[jira] [Closed] (CAY-2537) Generate DB Schema: Schema Generation Complete popup window is hidden
[ https://issues.apache.org/jira/browse/CAY-2537?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arseni Bulatski closed CAY-2537. Resolution: Fixed > Generate DB Schema: Schema Generation Complete popup window is hidden > - > > Key: CAY-2537 > URL: https://issues.apache.org/jira/browse/CAY-2537 > Project: Cayenne > Issue Type: Bug >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > Run Generate DB Schema > Select Options, click Generate > Connect to DB > -> 'Generate DB Schema: Options' pop up window is displayed grayed > -> user needs to click anywhere in the app to bring up Schema Generation > Complete window to see generation result messages -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CAY-2537) Generate DB Schema: Schema Generation Complete popup window is hidden
[ https://issues.apache.org/jira/browse/CAY-2537?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16766885#comment-16766885 ] Arseni Bulatski commented on CAY-2537: -- [https://github.com/apache/cayenne/commit/42cd57701ad360600b1c8fdba52cc330e6924146] [https://github.com/apache/cayenne/commit/fbaf3e50d3a8c692cf44358f33904ee6efc1a3a9] > Generate DB Schema: Schema Generation Complete popup window is hidden > - > > Key: CAY-2537 > URL: https://issues.apache.org/jira/browse/CAY-2537 > Project: Cayenne > Issue Type: Bug >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > Run Generate DB Schema > Select Options, click Generate > Connect to DB > -> 'Generate DB Schema: Options' pop up window is displayed grayed > -> user needs to click anywhere in the app to bring up Schema Generation > Complete window to see generation result messages -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[cayenne] branch STABLE-4.1 updated: CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden
This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new fbaf3e5 CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden fbaf3e5 is described below commit fbaf3e50d3a8c692cf44358f33904ee6efc1a3a9 Author: Arseni Bulatski AuthorDate: Wed Feb 13 10:26:57 2019 +0300 CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 75d0625..c5d22d5 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -61,6 +61,7 @@ CAY-2530 DB Import and Class Generation from Project is performed for removed da CAY-2531 Importing same schema after Import Revert clears all entities in datamap CAY-2533 Modeler: Exception on validating ObjRelationship without db path CAY-2535 Imposible to import stored proceedure apart from db tables +CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden -- Release: 4.1.M2
[cayenne] branch STABLE-4.1 updated: CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden
This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new 42cd577 CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden 42cd577 is described below commit 42cd57701ad360600b1c8fdba52cc330e6924146 Author: Arseni Bulatski AuthorDate: Wed Feb 13 10:23:27 2019 +0300 CAY-2537 Generate DB Schema: Schema Generation Complete popup window is hidden --- .../cayenne/modeler/dialog/ValidationResultBrowserView.java | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java index 3bd28c0..0ed7a7d 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java @@ -20,10 +20,6 @@ package org.apache.cayenne.modeler.dialog; -import com.jgoodies.forms.builder.PanelBuilder; -import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.FormLayout; - import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDialog; @@ -35,6 +31,11 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; +import com.jgoodies.forms.builder.PanelBuilder; +import com.jgoodies.forms.layout.CellConstraints; +import com.jgoodies.forms.layout.FormLayout; +import org.apache.cayenne.modeler.Application; + /** */ public class ValidationResultBrowserView extends JDialog { @@ -44,6 +45,8 @@ public class ValidationResultBrowserView extends JDialog { protected JButton closeButton; public ValidationResultBrowserView() { +super(Application.getFrame()); + this.closeButton = new JButton("Close"); this.messageLabel = new JTextArea();
[cayenne] branch STABLE-4.1 updated: Fix javadoc generation on java 11
This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new f379a96 Fix javadoc generation on java 11 f379a96 is described below commit f379a9657772010676ad63b5e40fc84b6096fe0c Author: Arseni Bulatski AuthorDate: Wed Feb 13 09:57:16 2019 +0300 Fix javadoc generation on java 11 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 4bc38cf..fe92769 100644 --- a/pom.xml +++ b/pom.xml @@ -815,6 +815,7 @@ ${javadoc.doclint} ${javadoc.additionalOptions} + 1.8
[jira] [Created] (CAY-2539) Import procedures with the help of MergerToken
Arseni Bulatski created CAY-2539: Summary: Import procedures with the help of MergerToken Key: CAY-2539 URL: https://issues.apache.org/jira/browse/CAY-2539 Project: Cayenne Issue Type: Task Components: dbimport Affects Versions: 4.2.M1 Reporter: Arseni Bulatski Fix For: 4.2.M1 Refactor dbImport. Import procedures with the help of MergerToken. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (CAY-2538) Modeler: dbImport configuration unclear behavior
Arseni Bulatski created CAY-2538: Summary: Modeler: dbImport configuration unclear behavior Key: CAY-2538 URL: https://issues.apache.org/jira/browse/CAY-2538 Project: Cayenne Issue Type: Bug Components: Modeler Affects Versions: 4.2.M1 Reporter: Arseni Bulatski Fix For: 4.2.M1 Default dbImport configuration is import all entities from selected catalog. If you select procedure to import, dbImport configuration tree view will show selected procedure. But when you'll start import, all entities from this catalog will be imported too. Use case: # Open dbImport tab # Select procedure to import # Run import You will see that all entities are in imported list too. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Closed] (CAY-2535) Imposible to import stored proceedure apart from db tables
[ https://issues.apache.org/jira/browse/CAY-2535?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arseni Bulatski closed CAY-2535. Resolution: Fixed > Imposible to import stored proceedure apart from db tables > -- > > Key: CAY-2535 > URL: https://issues.apache.org/jira/browse/CAY-2535 > Project: Cayenne > Issue Type: Bug > Components: dbimport, Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > # Import db schema > # Modify db, add stored procedure > # On DB Import tab, refresh db schema and include stored procedure to import > configuration > # Run Import > -> Nothing to import. Stored procedure is not imported. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CAY-2535) Imposible to import stored proceedure apart from db tables
[ https://issues.apache.org/jira/browse/CAY-2535?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16765982#comment-16765982 ] Arseni Bulatski commented on CAY-2535: -- https://github.com/apache/cayenne/commit/dfa6c6ac52f827b42f73cc97b863e5e44a62ebfc > Imposible to import stored proceedure apart from db tables > -- > > Key: CAY-2535 > URL: https://issues.apache.org/jira/browse/CAY-2535 > Project: Cayenne > Issue Type: Bug > Components: dbimport, Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > # Import db schema > # Modify db, add stored procedure > # On DB Import tab, refresh db schema and include stored procedure to import > configuration > # Run Import > -> Nothing to import. Stored procedure is not imported. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[cayenne] branch STABLE-4.1 updated: CAY-2535 Imposible to import stored proceedure apart from db tables
This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new dfa6c6a CAY-2535 Imposible to import stored proceedure apart from db tables dfa6c6a is described below commit dfa6c6ac52f827b42f73cc97b863e5e44a62ebfc Author: Arseni Bulatski AuthorDate: Tue Feb 12 15:17:38 2019 +0300 CAY-2535 Imposible to import stored proceedure apart from db tables --- RELEASE-NOTES.txt | 1 + .../reverse/dbimport/DefaultDbImportAction.java| 42 +++--- .../dialog/db/load/ModelerDbImportAction.java | 40 + .../cayenne/modeler/editor/DbImportController.java | 19 ++ 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 509d9a0..75d0625 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -60,6 +60,7 @@ CAY-2505 EventBridge providers should be bound without scope CAY-2530 DB Import and Class Generation from Project is performed for removed datamaps CAY-2531 Importing same schema after Import Revert clears all entities in datamap CAY-2533 Modeler: Exception on validating ObjRelationship without db path +CAY-2535 Imposible to import stored proceedure apart from db tables -- Release: 4.1.M2 diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java index d0884cc..7785234 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportAction.java @@ -19,6 +19,16 @@ package org.apache.cayenne.dbsync.reverse.dbimport; +import javax.sql.DataSource; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.sql.Connection; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.configuration.ConfigurationNode; import org.apache.cayenne.configuration.ConfigurationTree; @@ -30,17 +40,17 @@ import org.apache.cayenne.configuration.server.DataSourceFactory; import org.apache.cayenne.configuration.server.DbAdapterFactory; import org.apache.cayenne.configuration.xml.DataChannelMetaData; import org.apache.cayenne.dba.DbAdapter; -import org.apache.cayenne.dbsync.merge.token.model.AbstractToModelToken; import org.apache.cayenne.dbsync.merge.DataMapMerger; import org.apache.cayenne.dbsync.merge.context.MergerContext; -import org.apache.cayenne.dbsync.merge.token.MergerToken; -import org.apache.cayenne.dbsync.reverse.dbload.ModelMergeDelegate; -import org.apache.cayenne.dbsync.reverse.dbload.ProxyModelMergeDelegate; import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactory; import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider; +import org.apache.cayenne.dbsync.merge.token.MergerToken; +import org.apache.cayenne.dbsync.merge.token.model.AbstractToModelToken; import org.apache.cayenne.dbsync.naming.ObjectNameGenerator; import org.apache.cayenne.dbsync.reverse.dbload.DbLoader; import org.apache.cayenne.dbsync.reverse.dbload.DbLoaderConfiguration; +import org.apache.cayenne.dbsync.reverse.dbload.ModelMergeDelegate; +import org.apache.cayenne.dbsync.reverse.dbload.ProxyModelMergeDelegate; import org.apache.cayenne.dbsync.reverse.filters.CatalogFilter; import org.apache.cayenne.dbsync.reverse.filters.FiltersConfig; import org.apache.cayenne.dbsync.reverse.filters.FiltersConfigBuilder; @@ -60,16 +70,6 @@ import org.apache.cayenne.validation.ValidationFailure; import org.apache.cayenne.validation.ValidationResult; import org.slf4j.Logger; -import javax.sql.DataSource; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.sql.Connection; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - import static org.apache.cayenne.util.Util.isBlank; /** @@ -272,19 +272,19 @@ public class DefaultDbImportAction implements DbImportAction { return false; } -if(!defaultPackage.equals(targetDataMap.getDefaultPackage())) { -return false; -} +return defaultPackage.equals(targetDataMap.getDefaultPackage()); +} -return true; +protected boolean hasChangesForProcedure(Procedure procedure) { +PatternFilter proceduresFilter = filters.proceduresFilter(procedure.getCatalog(), procedure.getSchema()); +return proceduresFilter != null &&
[jira] [Closed] (CAY-2531) Importing same schema after Import Revert clears all entities in datamap
[ https://issues.apache.org/jira/browse/CAY-2531?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Arseni Bulatski closed CAY-2531. Resolution: Fixed > Importing same schema after Import Revert clears all entities in datamap > > > Key: CAY-2531 > URL: https://issues.apache.org/jira/browse/CAY-2531 > Project: Cayenne > Issue Type: Bug > Components: dbimport, Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > Preconditions: configure connection to db with multiple schemas > # Select one schema in DB Schema window, Import > -> successfully imported > # Remove schema from db import configuration window > # Run Import, click Revert in Result pop up window > # Add same schema to db import config window, run Import once more > -> 'not changes to import' window appears. > 4. Click OK > -> all previously imported entities are removed in datamap -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (CAY-2531) Importing same schema after Import Revert clears all entities in datamap
[ https://issues.apache.org/jira/browse/CAY-2531?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16765870#comment-16765870 ] Arseni Bulatski commented on CAY-2531: -- https://github.com/apache/cayenne/commit/d61a36d9dbba3ef3f98a1f674f8cbdd7761d6274 > Importing same schema after Import Revert clears all entities in datamap > > > Key: CAY-2531 > URL: https://issues.apache.org/jira/browse/CAY-2531 > Project: Cayenne > Issue Type: Bug > Components: dbimport, Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > Preconditions: configure connection to db with multiple schemas > # Select one schema in DB Schema window, Import > -> successfully imported > # Remove schema from db import configuration window > # Run Import, click Revert in Result pop up window > # Add same schema to db import config window, run Import once more > -> 'not changes to import' window appears. > 4. Click OK > -> all previously imported entities are removed in datamap -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[cayenne] branch STABLE-4.1 updated: CAY-2531 Importing same schema after Import Revert clears all entities in datamap
This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git The following commit(s) were added to refs/heads/STABLE-4.1 by this push: new d61a36d CAY-2531 Importing same schema after Import Revert clears all entities in datamap d61a36d is described below commit d61a36d9dbba3ef3f98a1f674f8cbdd7761d6274 Author: Arseni Bulatski AuthorDate: Tue Feb 12 12:35:32 2019 +0300 CAY-2531 Importing same schema after Import Revert clears all entities in datamap --- RELEASE-NOTES.txt | 1 + .../modeler/dialog/db/load/DbLoadResultDialog.java | 18 ++-- .../dialog/db/load/ModelerDbImportAction.java | 51 +++--- .../cayenne/modeler/editor/DbImportController.java | 9 ++-- 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index b1ae7b0..509d9a0 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -58,6 +58,7 @@ CAY-2502 DataMap in DataNode tree view disappears after dbImport CAY-2504 Broken detection logic of NoopEventBridge in DataRowStoreFactory CAY-2505 EventBridge providers should be bound without scope CAY-2530 DB Import and Class Generation from Project is performed for removed datamaps +CAY-2531 Importing same schema after Import Revert clears all entities in datamap CAY-2533 Modeler: Exception on validating ObjRelationship without db path -- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java index 898b9b1..33ae7ea 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java @@ -19,10 +19,6 @@ package org.apache.cayenne.modeler.dialog.db.load; -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.layout.FormLayout; -import org.apache.cayenne.map.DataMap; - import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JDialog; @@ -36,9 +32,14 @@ import javax.swing.table.DefaultTableModel; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.FlowLayout; +import java.awt.event.ActionListener; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import com.jgoodies.forms.builder.DefaultFormBuilder; +import com.jgoodies.forms.layout.FormLayout; +import org.apache.cayenne.map.DataMap; + /** * @since 4.1 */ @@ -124,6 +125,15 @@ public class DbLoadResultDialog extends JDialog { return tokensTableModel; } +public void removeListenersFromButtons() { +for(ActionListener actionListener : okButton.getActionListeners()) { +okButton.removeActionListener(actionListener); +} +for(ActionListener actionListener : revertButton.getActionListeners()) { +revertButton.removeActionListener(actionListener); +} +} + public synchronized void addRowToOutput(String output, DataMap dataMap) { prepareTable(dataMap).addRow(new Object[]{output}); } diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java index 8be5309..476f4d0 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java @@ -19,6 +19,14 @@ package org.apache.cayenne.modeler.dialog.db.load; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + import org.apache.cayenne.CayenneRuntimeException; import org.apache.cayenne.configuration.DataChannelDescriptorLoader; import org.apache.cayenne.configuration.DataMapLoader; @@ -36,14 +44,6 @@ import org.apache.cayenne.modeler.editor.DbImportController; import org.apache.cayenne.project.ProjectSaver; import org.slf4j.Logger; -import javax.swing.JDialog; -import javax.swing.JOptionPane; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.io.IOException; -import java.util.Collection; -import java.util.List; - public class ModelerDbImportAction extends DefaultDbImportAction { private static final String DIALOG_TITLE = "Reverse Engineering Result"; @@ -85,23 +85,6 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
[jira] [Updated] (CAY-2535) Imposible to import stored proceedure apart from db tables
[ https://issues.apache.org/jira/browse/CAY-2535?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2535: - Component/s: dbimport > Imposible to import stored proceedure apart from db tables > -- > > Key: CAY-2535 > URL: https://issues.apache.org/jira/browse/CAY-2535 > Project: Cayenne > Issue Type: Bug > Components: dbimport, Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Minor > Fix For: 4.1.M3 > > > # Import db schema > # Modify db, add stored procedure > # On DB Import tab, refresh db schema and include stored procedure to import > configuration > # Run Import > -> Nothing to import. Stored procedure is not imported. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2478) cgen: Generate properties for PK
[ https://issues.apache.org/jira/browse/CAY-2478?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2478: - Component/s: cgen > cgen: Generate properties for PK > > > Key: CAY-2478 > URL: https://issues.apache.org/jira/browse/CAY-2478 > Project: Cayenne > Issue Type: Improvement > Components: cgen, Modeler, Non-GUI Tools >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Major > Fix For: 4.1.M3 > > > To use PK in query (in where or order by clause) you need to write custom > expressions and that is most likely ugly (something like > {{ExpressionFactory.matchDbExp("db:" + Artist.ARTIST_ID_PK_COLUMN, 1)}}) > So we may just use Cayenne Property API and generate these properties in cgen > tools. This will lead to much cleaner code: {{Artist.ARTIST_ID_COLUMN.eq(1)}} > A few things to keep in mind: > * PK can be compound, in that case there should be several properties > * PK can be already mapped on ObjAttribute, in that case we shouldn't > generate anything > * PK property naming shouldn't clash with other properties > * this feature should be optional (or not?) -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2530) DB Import and Class Generation from Project is performed for removed datamaps
[ https://issues.apache.org/jira/browse/CAY-2530?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2530: - Component/s: dbimport cgen > DB Import and Class Generation from Project is performed for removed datamaps > - > > Key: CAY-2530 > URL: https://issues.apache.org/jira/browse/CAY-2530 > Project: Cayenne > Issue Type: Bug > Components: cgen, dbimport, Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Arseni Bulatski >Priority: Major > Fix For: 4.1.M3 > > > # Add 2 datamaps > # Configure db import for both and run import > # Generate classes in both datamaps > # Remove one datamap, save > # Click on Project and make sure DB Import and Class Generation tab have > only one datamap and it is selected -> OK > # Run DB Import and Generate Classes from Project 'level' > -> db import and class generation is performed for both, removed and selected > datamaps -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2338) Support comments in cgen and default templates
[ https://issues.apache.org/jira/browse/CAY-2338?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2338: - Component/s: cgen > Support comments in cgen and default templates > -- > > Key: CAY-2338 > URL: https://issues.apache.org/jira/browse/CAY-2338 > Project: Cayenne > Issue Type: Sub-task > Components: cgen, Modeler, Non-GUI Tools >Reporter: Nikita Timofeev >Priority: Major > Fix For: 4.2.M1 > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2510) Create builder to load custom modules into plugins and modeler
[ https://issues.apache.org/jira/browse/CAY-2510?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2510: - Component/s: Modeler cgen > Create builder to load custom modules into plugins and modeler > -- > > Key: CAY-2510 > URL: https://issues.apache.org/jira/browse/CAY-2510 > Project: Cayenne > Issue Type: Task > Components: cgen, Core Library, Modeler >Affects Versions: 4.2.M1 >Reporter: Arseni Bulatski >Priority: Major > Labels: pull-request-available > Fix For: 4.2.M1 > > > Should be created because now ServerRuntimeBuilder loads and configures > modules while we don't have ServerRuntimeBuilder in plugins and modeler. > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2492) Add revert button
[ https://issues.apache.org/jira/browse/CAY-2492?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2492: - Component/s: Modeler dbimport > Add revert button > - > > Key: CAY-2492 > URL: https://issues.apache.org/jira/browse/CAY-2492 > Project: Cayenne > Issue Type: Improvement > Components: dbimport, Modeler >Reporter: Konstantin >Assignee: Nikita Timofeev >Priority: Minor > Fix For: 4.1.M3 > > > Add revert button in Reverse Engineering result dialog. It should commit the > result only after OK button is pressed. On Revert it should do nothing. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2536) No Catalog/Schema selection in Generate Database Schema
[ https://issues.apache.org/jira/browse/CAY-2536?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2536: - Fix Version/s: 4.2.M1 > No Catalog/Schema selection in Generate Database Schema > --- > > Key: CAY-2536 > URL: https://issues.apache.org/jira/browse/CAY-2536 > Project: Cayenne > Issue Type: Bug > Components: Modeler >Affects Versions: 4.1.M3 >Reporter: ana benko >Assignee: Nikita Timofeev >Priority: Minor > Fix For: 4.2.M1 > > > There's no catalog/schema selection in Generate Database Schema after > selecting db connection without catalog/schema in url > -> no db is generated > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2467) New type-aware Property API
[ https://issues.apache.org/jira/browse/CAY-2467?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2467: - Component/s: cgen > New type-aware Property API > --- > > Key: CAY-2467 > URL: https://issues.apache.org/jira/browse/CAY-2467 > Project: Cayenne > Issue Type: Task > Components: cgen, Core Library >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Major > Fix For: 4.2.M1 > > > Current {{o.a.c.exp.Property}} API is really useful, but it mixes up > everything in one huge class. > It is hard to extend and it allows to make expressions that doesn't make any > sense (like {{Artist.ARTIST_NAME.mod(5)}}). > So we can use our knowledge of property types in {{cgen}} and provide > type-specific variants > (like Numeric, String, Relationship etc.) > This will nicely fix mentioned issues and CAY-2332 -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2241) cdbimport: set ObjRelationship delete rule from FK metadata (if it's possible)
[ https://issues.apache.org/jira/browse/CAY-2241?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2241: - Component/s: dbimport > cdbimport: set ObjRelationship delete rule from FK metadata (if it's possible) > -- > > Key: CAY-2241 > URL: https://issues.apache.org/jira/browse/CAY-2241 > Project: Cayenne > Issue Type: Improvement > Components: dbimport, Modeler, Non-GUI Tools >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.2.M1 > > > DbRelationship doesn't know anything about delete rule and just set it to > ObjRelationship's default ("Deny") in case of new relationship is detected in > cdbimport. > If we can set this value based on DB metadata this can save someone from > unnecessary troubles. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2402) cdbimport: escape db names that is not valid Java identifiers
[ https://issues.apache.org/jira/browse/CAY-2402?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2402: - Component/s: dbimport > cdbimport: escape db names that is not valid Java identifiers > - > > Key: CAY-2402 > URL: https://issues.apache.org/jira/browse/CAY-2402 > Project: Cayenne > Issue Type: Bug > Components: dbimport, Non-GUI Tools >Affects Versions: 4.0.B2, 4.1.M1 >Reporter: Nikita Timofeev >Priority: Minor > Labels: pull-request-available > Fix For: 4.2.M1 > > > Database names starting with numbers are converted as is in Object attribute > names. > I.e. name like {{"123name"}} will end as {{}}. > It can be fixed by prefixing with {{"_"}} such names. > Also should review other special characters that can be in db names. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Updated] (CAY-2493) Save cgen configuration with datamap XML
[ https://issues.apache.org/jira/browse/CAY-2493?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Nikita Timofeev updated CAY-2493: - Component/s: cgen > Save cgen configuration with datamap XML > > > Key: CAY-2493 > URL: https://issues.apache.org/jira/browse/CAY-2493 > Project: Cayenne > Issue Type: Improvement > Components: cgen, Modeler, Non-GUI Tools >Reporter: Nikita Timofeev >Assignee: Nikita Timofeev >Priority: Major > Labels: pull-request-available > Fix For: 4.1.M3 > > > This task is about saving and managing cgen config inside data map file. It > also requires UI changes (as done with reverse engineering config per > CAY-2337) -- This message was sent by Atlassian JIRA (v7.6.3#76005)