You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/03/25 07:16:40 UTC

[cayenne] branch master updated: Update docs

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 0b4990f  Update docs
0b4990f is described below

commit 0b4990f52f1041bb0268e76b27cf5c864e29a7ab
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Mon Mar 25 10:14:26 2019 +0300

    Update docs
---
 .../object-relational-mapping.adoc                  |  16 ++++++----------
 .../src/docs/asciidoc/images/icon-attribute.png     | Bin 293 -> 304 bytes
 .../src/docs/asciidoc/images/icon-datamap.png       | Bin 411 -> 529 bytes
 .../src/docs/asciidoc/images/icon-dbentity.png      | Bin 142 -> 257 bytes
 .../src/docs/asciidoc/images/icon-edit.png          | Bin 340 -> 343 bytes
 .../src/docs/asciidoc/images/icon-new_objentity.png | Bin 563 -> 585 bytes
 .../src/docs/asciidoc/images/icon-node.png          | Bin 350 -> 384 bytes
 .../src/docs/asciidoc/images/icon-relationship.png  | Bin 347 -> 384 bytes
 .../src/docs/asciidoc/images/icon-sync.png          | Bin 280 -> 245 bytes
 .../docs/asciidoc/images/modeler-dbrelationship.png | Bin 41430 -> 55118 bytes
 10 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc
index 89a5260..2b8271b 100644
--- a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc
+++ b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/_getting-started-guide/object-relational-mapping.adoc
@@ -48,19 +48,19 @@ Start by creating a one-to-many ARTIST/PAINTING relationship:
 
 - Select the ARTIST DbEntity on the left and click on the "Properties" tab.
 
-- Click on "Create Relationship" button on the entity toolbar image:icon-relationship.png[] - a relationship
-called "untitledRel" is created.
+- Click on "Create Relationship" button on the entity toolbar image:icon-relationship.png[] - relationship
+configuration dialog is presented.
 
 - Choose the "Target" to be "Painting".
 
-- Click on the "Database Mapping" button image:icon-edit.png[] - relationship
-configuration dialog is presented. Here you can assign a name to the
-relationship and also its complimentary reverse relationship. This name can be
+- Assign names for relationship and reverse relationship. This name can be
 anything (this is really a symbolic name of the database referential
 constraint), but it is recommended to use a valid Java identifier, as this will
 save some typing later. We'll call the relationship "paintings" and reverse
 relationship "artist".
 
+- Check "ToMany" checkbox for "paintings" relationship
+
 - Click on "Add" button on the right to add a join
 
 - Select "ID" column for the "Source" and "ARTIST_ID" column for the target.
@@ -72,11 +72,7 @@ image::modeler-dbrelationship.png[align="center"]
 - Click "Done" to confirm the changes and close the dialog.
 
 - Two complimentary relationships have been created - from ARTIST to PAINTING
-and back. Still you may have noticed one thing is missing - "paintings"
-relationship should be to-many, but "To Many" checkbox is not checked. Let's
-change that - check the checkbox for "paintings" relationship, and then click on
-PAINTING DbEntity, and uncheck "artist" relationship "To Many" to make the
-reverse relationship "to-one" as it should be.
+and back.
 
 - Repeat the steps above to create a many-to-one relationship from PAINTING to GALLERY, calling the relationships pair
 "gallery" and "paintings".
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png
index 77a68eb..f5b324d 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-attribute.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png
index 2ea96ca..90db1af 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-datamap.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png
index 87d9d8a..07b6a75 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-dbentity.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-edit.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-edit.png
index 027c482..a874d51 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-edit.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-edit.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png
index 8735d7a..7530e05 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-new_objentity.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-node.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-node.png
index 2ff4383..fe0f402 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-node.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-node.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png
index 44ed7eb..c7d6610 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-relationship.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-sync.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-sync.png
index 03e8623..d194ea7 100755
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-sync.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/icon-sync.png differ
diff --git a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png
index 4b23eb5..46705d2 100644
Binary files a/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png and b/docs/asciidoc/getting-started-guide/src/docs/asciidoc/images/modeler-dbrelationship.png differ