cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skolbac...@apache.org
Subject [1/2] cayenne git commit: Fix validation failure on sql template without root
Date Thu, 03 Nov 2016 20:38:51 GMT
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 <stariy95@gmail.com>
Authored: Thu Nov 3 16:56:58 2016 +0300
Committer: Savva Kolbachev <s.kolbachev@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);
+            }
+        }
     };
 }


Mime
View raw message