diff options
| -rw-r--r-- | AllLangHelp_sdatabase.mk | 1 | ||||
| -rw-r--r-- | AllLangHelp_shared.mk | 1 | ||||
| -rw-r--r-- | source/text/sdatabase/02010100.xhp | 2 | ||||
| -rw-r--r-- | source/text/sdatabase/02010101.xhp (renamed from source/text/shared/explorer/database/02010101.xhp) | 22 |
4 files changed, 13 insertions, 13 deletions
diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk index bca681984c..45fff73e8e 100644 --- a/AllLangHelp_sdatabase.mk +++ b/AllLangHelp_sdatabase.mk @@ -20,6 +20,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\ helpcontent2/source/text/sdatabase/02000000 \ helpcontent2/source/text/sdatabase/02000002 \ helpcontent2/source/text/sdatabase/02010100 \ + helpcontent2/source/text/sdatabase/02010101 \ helpcontent2/source/text/sdatabase/toolbars \ )) diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 1dfbd1d492..d587c0cae7 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -860,7 +860,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ )) $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ - helpcontent2/source/text/shared/explorer/database/02010101 \ helpcontent2/source/text/shared/explorer/database/04000000 \ helpcontent2/source/text/shared/explorer/database/04030000 \ helpcontent2/source/text/shared/explorer/database/05000000 \ diff --git a/source/text/sdatabase/02010100.xhp b/source/text/sdatabase/02010100.xhp index 44d31d74bc..0e6cd9e996 100644 --- a/source/text/sdatabase/02010100.xhp +++ b/source/text/sdatabase/02010100.xhp @@ -127,7 +127,7 @@ <note id="par_id3145646">You cannot access tables from different databases in a query. Queries involving multiple tables can only be created within one database.</note> <h3 id="hd_id3153279">Specifying the relation type</h3> -<paragraph id="par_id3154791" role="paragraph" xml-lang="en-US">If you double-click on the line connecting two linked fields or call the menu command <emph>Insert - New Relation</emph>, you can specify the type of relation in the <link href="text/shared/explorer/database/02010101.xhp" name="Relations"><emph>Relations</emph></link> dialog.</paragraph> +<paragraph id="par_id3154791" role="paragraph" xml-lang="en-US">If you double-click on the line connecting two linked fields or call the menu command <emph>Insert - New Relation</emph>, you can specify the type of relation in the <link href="text/sdatabase/02010101.xhp" name="Relations"><emph>Relations</emph></link> dialog.</paragraph> <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_QUERY_EDIT_JOINCONNECTION" id="bm_id3145253" localize="false"/> <paragraph id="par_id3150094" role="paragraph" xml-lang="en-US"><ahelp hid="HID_QUERY_EDIT_JOINCONNECTION" visibility="hidden">Edit Join Properties.</ahelp> Alternatively, press Tab until the line is selected, then press Shift+F10 to display the context menu and there choose the command <emph>Edit</emph>. Some databases support only a subset of the possible join types.</paragraph> diff --git a/source/text/shared/explorer/database/02010101.xhp b/source/text/sdatabase/02010101.xhp index f55468450a..212c76f245 100644 --- a/source/text/shared/explorer/database/02010101.xhp +++ b/source/text/sdatabase/02010101.xhp @@ -23,7 +23,7 @@ <meta> <topic id="textsharedexplorerdatabase02010101xml" indexer="include" status="PUBLISH"> <title xml-lang="en-US" id="tit">Join Properties</title> - <filename>/text/shared/explorer/database/02010101.xhp</filename> + <filename>/text/sdatabase/02010101.xhp</filename> </topic> </meta> <body> @@ -34,30 +34,30 @@ <bookmark_value>right joins (Base)</bookmark_value> <bookmark_value>full joins (Base)</bookmark_value> </bookmark><comment>mw deleted "join properties" and changed "link properties..." to "links;"</comment> -<paragraph xml-lang="en-US" id="hd_id3154015" role="heading" level="1">Join Properties</paragraph> +<h1 id="hd_id3154015">Join Properties</h1> <paragraph xml-lang="en-US" id="par_id3151205" role="paragraph">If you double-click a connection between two linked fields in the query design, or if you choose <emph>Insert - New Relation</emph>, the <emph>Join Properties</emph> dialog appears. These properties will be used in all queries created in the future.</paragraph> <section id="howtoget"> <embed href="text/shared/00/00000450.xhp#Joins"/> </section> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/table1" id="bm_id3150749" localize="false"/> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/table2" id="bm_id3150752" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="2">Tables involved</paragraph> +<h2 id="hd_id3155066">Tables involved</h2> <paragraph xml-lang="en-US" id="par_id3153924" role="paragraph"><ahelp hid="dbaccess/ui/joindialog/table2">Specifies two different tables that you want to join.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="hd_id3155766" role="heading" level="2">Fields involved</paragraph> + <h2 id="hd_id3155766">Fields involved</h2> <paragraph xml-lang="en-US" id="par_id3148994" role="paragraph"><ahelp hid=".">Specifies two data fields that will be joined by a relation.</ahelp></paragraph> - <paragraph xml-lang="en-US" id="hd_id3159267" role="heading" level="2">Options</paragraph> + <h2 id="hd_id3159267">Options</h2> <bookmark xml-lang="en-US" branch="hid/dbaccess/ui/joindialog/type" id="bm_id3147321" localize="false"/> -<paragraph xml-lang="en-US" id="hd_id3147340" role="heading" level="3">Type</paragraph> +<h3 id="hd_id3147340">Type</h3> <paragraph xml-lang="en-US" id="par_id3152482" role="paragraph"><ahelp hid="dbaccess/ui/joindialog/type">Specifies the join type of the selected join.</ahelp> Some databases support only a subset of the various possible types.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3">Inner Join</paragraph> + <h3 id="hd_id3155334">Inner Join</h3> <paragraph xml-lang="en-US" id="par_id3155936" role="paragraph"><ahelp hid="dbaccess/ui/joindialog/type">In an inner join, the results table contains only those records for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link is created by a corresponding WHERE clause.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3156372" role="heading" level="3">Left Join</paragraph> + <h3 id="hd_id3156372">Left Join</h3> <paragraph xml-lang="en-US" id="par_id3166450" role="paragraph"><ahelp hid="dbaccess/ui/joindialog/type">In a left join, the results table contains all records of the queried fields from the left table and only those records of the queried fields from the right table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the LEFT OUTER JOIN command.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3155607" role="heading" level="3">Right Join</paragraph> + <h3 id="hd_id3155607">Right Join</h3> <paragraph xml-lang="en-US" id="par_id3150647" role="paragraph"><ahelp hid="dbaccess/ui/joindialog/type">In a right join, the results table contains all records of the queried fields from the right table and only those records of the queried fields from the left table for which the content of the linked fields is the same.</ahelp> In $[officename] SQL this type of link corresponds to the RIGHT OUTER JOIN command.</paragraph> - <paragraph xml-lang="en-US" id="hd_id3158215" role="heading" level="3">Full Join</paragraph> + <h3 id="hd_id3158215">Full Join</h3> <paragraph xml-lang="en-US" id="par_id3163665" role="paragraph"><ahelp hid="dbaccess/ui/joindialog/type">In a full join, the results table contains all records of the queried fields from the left and right tables.</ahelp> In the SQL of $[officename] this type of link corresponds to the FULL OUTER JOIN command.</paragraph> -<paragraph xml-lang="en-US" id="hd_id0305200912031976" role="heading" level="3">Natural</paragraph> +<h3 id="hd_id0305200912031976">Natural</h3> <paragraph xml-lang="en-US" id="par_id0305200912031977" role="paragraph"><ahelp hid=".">In a natural join, the keyword NATURAL in inserted into the SQL statement that defines the relation. The relation joins all columns that have the same column name in both tables. The resulting joined table contains only one column for each pair of equally named columns.</ahelp></paragraph> </body> </helpdocument> |