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/03 20:38:51 UTC
[1/2] cayenne git commit: Fix validation failure on sql template
without root
Repository: cayenne
Updated Branches:
refs/heads/master c4ebfa5d4 -> ffa43caaf
Fix validation failure on sql template without root
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1c9ed97a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1c9ed97a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1c9ed97a
Branch: refs/heads/master
Commit: 1c9ed97a1d42a11d8f3f0736444ec93e9040cac5
Parents: c4ebfa5
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 3 16:56:58 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Nov 3 23:35:59 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/editor/SQLTemplateMainTab.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1c9ed97a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
index e5d2a75..cb3aa05 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/SQLTemplateMainTab.java
@@ -263,5 +263,13 @@ public class SQLTemplateMainTab extends JPanel {
return null;
}
+
+ @Override
+ protected void setFetchingDataObjects(boolean dataObjects) {
+ super.setFetchingDataObjects(dataObjects);
+ if(!dataObjects) {
+ setEntity(null);
+ }
+ }
};
}
[2/2] cayenne git commit: Merge branch '118'
Posted by sk...@apache.org.
Merge branch '118'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ffa43caa
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ffa43caa
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ffa43caa
Branch: refs/heads/master
Commit: ffa43caaf1ad22119678f8fa7eec197990bf4b00
Parents: c4ebfa5 1c9ed97
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Nov 3 23:37:37 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Nov 3 23:37:37 2016 +0300
----------------------------------------------------------------------
.../apache/cayenne/modeler/editor/SQLTemplateMainTab.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------