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 2016/04/20 10:06:21 UTC
[1/3] cayenne git commit: procedure catalog support
Repository: cayenne
Updated Branches:
refs/heads/master 3a7e93142 -> 9a959583a
procedure catalog support
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f48fb182
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f48fb182
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f48fb182
Branch: refs/heads/master
Commit: f48fb182d76dc3dbb5d807bbc03999a1749d12bc
Parents: 2770701
Author: olga <ol...@gmail.com>
Authored: Wed Apr 6 13:44:39 2016 +0300
Committer: olga <ol...@gmail.com>
Committed: Fri Apr 8 14:01:15 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/map/Procedure.java | 6 ++-
.../org/apache/cayenne/schema/8/modelMap.xsd | 2 +
.../modeler/action/CreateProcedureAction.java | 1 +
.../cayenne/modeler/editor/ProcedureTab.java | 47 +++++++++++++-------
4 files changed, 38 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f48fb182/cayenne-server/src/main/java/org/apache/cayenne/map/Procedure.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/Procedure.java b/cayenne-server/src/main/java/org/apache/cayenne/map/Procedure.java
index 356e1c2..d411f58 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/Procedure.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/Procedure.java
@@ -121,10 +121,12 @@ public class Procedure implements ConfigurationNode, CayenneMapEntry, XMLSeriali
}
/**
- * Returns procedure name including schema, if present.
+ * Returns procedure name including schema and catalog, if present.
*/
public String getFullyQualifiedName() {
- return (schema != null) ? schema + '.' + getName() : getName();
+ return (catalog != null ? catalog + '.' : "")
+ + (schema != null ? schema + '.' : "")
+ + name;
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f48fb182/cayenne-server/src/main/resources/org/apache/cayenne/schema/8/modelMap.xsd
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/resources/org/apache/cayenne/schema/8/modelMap.xsd b/cayenne-server/src/main/resources/org/apache/cayenne/schema/8/modelMap.xsd
index 37f0f91..3d77151 100644
--- a/cayenne-server/src/main/resources/org/apache/cayenne/schema/8/modelMap.xsd
+++ b/cayenne-server/src/main/resources/org/apache/cayenne/schema/8/modelMap.xsd
@@ -269,6 +269,8 @@
</xs:sequence>
<xs:attribute name="name" use="required" type="xs:string"/>
<xs:attribute name="schema" type="xs:string"/>
+ <xs:attribute name="catalog" type="xs:string"/>
+ <xs:attribute name="returningValue" type="xs:string"/>
</xs:complexType>
</xs:element>
<xs:element name="pre-update">
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f48fb182/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
index 830ebca..1c5397f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
@@ -71,6 +71,7 @@ public class CreateProcedureAction extends CayenneAction {
public void createProcedure(DataMap map, Procedure procedure) {
ProjectController mediator = getProjectController();
procedure.setSchema(map.getDefaultSchema());
+ procedure.setCatalog(map.getDefaultCatalog());
map.addProcedure(procedure);
fireProcedureEvent(this, mediator, map, procedure);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f48fb182/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
index 041c04a..476beb8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
@@ -29,6 +29,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
+import com.jgoodies.forms.builder.DefaultFormBuilder;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.event.ProcedureEvent;
import org.apache.cayenne.map.Procedure;
@@ -40,8 +41,6 @@ import org.apache.cayenne.modeler.util.TextAdapter;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
-import com.jgoodies.forms.builder.PanelBuilder;
-import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
/**
@@ -54,6 +53,7 @@ public class ProcedureTab extends JPanel implements ProcedureDisplayListener, Ex
protected ProjectController eventController;
protected TextAdapter name;
protected TextAdapter schema;
+ protected TextAdapter catalog;
protected JCheckBox returnsValue;
protected boolean ignoreChange;
@@ -81,27 +81,28 @@ public class ProcedureTab extends JPanel implements ProcedureDisplayListener, Ex
}
};
- this.returnsValue = new JCheckBox();
+ this.catalog = new TextAdapter(new JTextField()) {
+
+ protected void updateModel(String text) {
+ setCatalog(text);
+ }
+ };
JLabel returnValueHelp = new JLabel("(first parameter will be used as return value)");
returnValueHelp.setFont(returnValueHelp.getFont().deriveFont(10));
- // assemble
- FormLayout layout = new FormLayout("right:max(50dlu;pref), 3dlu, left:max(20dlu;pref), 3dlu, fill:150dlu",
- "p, 3dlu, p, 3dlu, p, 3dlu, p");
+ this.returnsValue = new JCheckBox();
+ this.returnsValue.setToolTipText(returnValueHelp.getText());
- CellConstraints cc = new CellConstraints();
- PanelBuilder builder = new PanelBuilder(layout);
+ FormLayout layout = new FormLayout("right:pref, 3dlu, fill:200dlu", "");
+ DefaultFormBuilder builder = new DefaultFormBuilder(layout);
builder.setDefaultDialogBorder();
- builder.addSeparator("Stored Procedure Configuration", cc.xywh(1, 1, 5, 1));
- builder.addLabel("Procedure Name:", cc.xy(1, 3));
- builder.add(name.getComponent(), cc.xywh(3, 3, 3, 1));
- builder.addLabel("Schema:", cc.xy(1, 5));
- builder.add(schema.getComponent(), cc.xywh(3, 5, 3, 1));
- builder.addLabel("Returns Value:", cc.xy(1, 7));
- builder.add(returnsValue, cc.xy(3, 7));
- builder.add(returnValueHelp, cc.xy(5, 7));
+ builder.appendSeparator("Stored Procedure Configuration");
+ builder.append("Procedure Name:", name.getComponent());
+ builder.append("Schema:", schema.getComponent());
+ builder.append("Catalog:", catalog.getComponent());
+ builder.append("Returns Value:", returnsValue);
this.setLayout(new BorderLayout());
this.add(builder.getPanel(), BorderLayout.CENTER);
@@ -139,6 +140,7 @@ public class ProcedureTab extends JPanel implements ProcedureDisplayListener, Ex
name.setText(procedure.getName());
schema.setText(procedure.getSchema());
+ catalog.setText(procedure.getCatalog());
ignoreChange = true;
returnsValue.setSelected(procedure.isReturningValue());
@@ -181,4 +183,17 @@ public class ProcedureTab extends JPanel implements ProcedureDisplayListener, Ex
eventController.fireProcedureEvent(new ProcedureEvent(this, procedure));
}
}
+
+ void setCatalog(String text) {
+ if (text != null && text.trim().length() == 0) {
+ text = null;
+ }
+
+ Procedure procedure = eventController.getCurrentProcedure();
+
+ if (procedure != null && !Util.nullSafeEquals(procedure.getCatalog(), text)) {
+ procedure.setCatalog(text);
+ eventController.fireProcedureEvent(new ProcedureEvent(this, procedure));
+ }
+ }
}
[3/3] cayenne git commit: CAY-2074 Support for catalogs in stored
procedures
Posted by aa...@apache.org.
CAY-2074 Support for catalogs in stored procedures
reordering fields - catalog goes first;
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9a959583
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9a959583
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9a959583
Branch: refs/heads/master
Commit: 9a959583ae8238d8b9f3929d38f9a9b8559954c3
Parents: a7fbadb
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Wed Apr 20 11:05:53 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Wed Apr 20 11:05:53 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/modeler/editor/ProcedureTab.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9a959583/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
index 476beb8..6d1d0a9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ProcedureTab.java
@@ -29,7 +29,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTextField;
-import com.jgoodies.forms.builder.DefaultFormBuilder;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.event.ProcedureEvent;
import org.apache.cayenne.map.Procedure;
@@ -41,6 +40,7 @@ import org.apache.cayenne.modeler.util.TextAdapter;
import org.apache.cayenne.util.Util;
import org.apache.cayenne.validation.ValidationException;
+import com.jgoodies.forms.builder.DefaultFormBuilder;
import com.jgoodies.forms.layout.FormLayout;
/**
@@ -100,8 +100,8 @@ public class ProcedureTab extends JPanel implements ProcedureDisplayListener, Ex
builder.appendSeparator("Stored Procedure Configuration");
builder.append("Procedure Name:", name.getComponent());
- builder.append("Schema:", schema.getComponent());
builder.append("Catalog:", catalog.getComponent());
+ builder.append("Schema:", schema.getComponent());
builder.append("Returns Value:", returnsValue);
this.setLayout(new BorderLayout());
[2/3] cayenne git commit: Merge branch '95'
Posted by aa...@apache.org.
Merge branch '95'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/a7fbadbf
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/a7fbadbf
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/a7fbadbf
Branch: refs/heads/master
Commit: a7fbadbf5a55779aa6d2606b52509af265803099
Parents: 3a7e931 f48fb18
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Wed Apr 20 11:03:43 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Wed Apr 20 11:03:43 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/map/Procedure.java | 6 ++-
.../org/apache/cayenne/schema/8/modelMap.xsd | 2 +
.../modeler/action/CreateProcedureAction.java | 1 +
.../cayenne/modeler/editor/ProcedureTab.java | 47 +++++++++++++-------
4 files changed, 38 insertions(+), 18 deletions(-)
----------------------------------------------------------------------