| index : builder | |
| Archlinux32 build system | gitolite user |
| summaryrefslogtreecommitdiff |
| author | Erich Eckner <git@eckner.net> | 2018-06-07 16:00:30 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-06-07 16:00:30 +0200 |
| commit | dd8de0e6238cb9ab6f48d727b4646d163e0ec961 (patch) | |
| tree | e5eefaa93d9274d3307d1a06bc27f20f0350391f | |
| parent | d6fa1ab345b8000166ce9d84813b13ae7ad1baf2 (diff) | |
| -rwxr-xr-x | bin/check-db-structure | 1 | ||||
| -rw-r--r-- | misc/database-layout.dmf | 1548 | ||||
| -rw-r--r-- | misc/database-layout.dump | 14 |
diff --git a/bin/check-db-structure b/bin/check-db-structure index 436ce00..8ecd692 100755 --- a/bin/check-db-structure +++ b/bin/check-db-structure @@ -40,6 +40,7 @@ # content of "constant" tables mysqldump --skip-lock-tables 'buildmaster' \ 'architectures' \ + 'architecture_compatibilities' \ 'dependency_types' \ 'email_actions' \ 'fail_reasons' \ diff --git a/misc/database-layout.dmf b/misc/database-layout.dmf index 92dce62..d2a9e1b 100644 --- a/misc/database-layout.dmf +++ b/misc/database-layout.dmf @@ -2,55 +2,43 @@ <diagram xmlns="http://oxygene.sk/ns/diagram/1/"> <notation>Relational</notation> <item-list> - <item type="database-table" id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"> + <item type="database-table" id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"> <position> - <x>543</x> - <y>182</y> + <x>360</x> + <y>400</y> </position> <table> - <name>binary_packages_in_repositories</name> + <name>architecture_compatibilities</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>BIGINT</data-type> - <required>True</required> - <primary-key>True</primary-key> - </column> - <column> - <name>package</name> - <data-type>BIGINT</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>repository</name> <data-type>MEDIUMINT</data-type> <required>True</required> - <primary-key>False</primary-key> + <primary-key>True</primary-key> </column> <column> - <name>is_to_be_deleted</name> - <data-type>BIT</data-type> + <name>built_for</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>last_moved</name> - <data-type>TIMESTAMP</data-type> + <name>runs_on</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{5f12db03-a8bb-4467-bab6-a57e545b9081}"> + <item type="database-table" id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"> <position> - <x>42</x> - <y>135</y> + <x>237</x> + <y>40</y> </position> <table> - <name>ssh_log</name> + <name>ssh_keys</name> <color>#ffffff</color> <column-list> <column> @@ -60,25 +48,13 @@ <primary-key>True</primary-key> </column> <column> - <name>date</name> - <data-type>TIMESTAMP</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>build_slave</name> + <name>owner</name> <data-type>MEDIUMINT</data-type> - <required>False</required> - <primary-key>False</primary-key> - </column> - <column> - <name>action</name> - <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>parameters</name> + <name>fingerprint</name> <data-type>TEXT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -86,199 +62,145 @@ </column-list> </table> </item> - <item type="database-table" id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"> + <item type="database-table" id="{6180fcbf-5069-4d86-8919-fd39394f1813}"> <position> - <x>-55</x> - <y>-72</y> + <x>-59</x> + <y>73</y> </position> <table> - <name>email_log</name> + <name>email_actions</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>BIGINT</data-type> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>date</name> - <data-type>TIMESTAMP</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>success</name> - <data-type>BIT</data-type> + <name>name</name> + <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> - <column> - <name>action</name> - <data-type>MEDIUMINT</data-type> - <required>False</required> - <primary-key>False</primary-key> - </column> - <column> - <name>count</name> - <data-type>MEDIUMINT</data-type> - <required>False</required> - <primary-key>False</primary-key> - </column> - <column> - <name>gpg_key</name> - <data-type>BIGINT</data-type> - <required>False</required> - <primary-key>False</primary-key> - </column> - <column> - <name>comment</name> - <data-type>TEXT</data-type> - <required>False</required> - <primary-key>False</primary-key> - </column> </column-list> </table> </item> - <item type="database-table" id="{d823ab09-1c04-44ee-ad4b-6802208967ff}"> + <item type="database-table" id="{b5671c08-e24a-4293-b983-3c86b1a6d622}"> <position> - <x>494</x> - <y>427</y> + <x>68</x> + <y>49</y> </position> <table> - <name>repository_moves</name> + <name>allowed_email_actions</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>MEDIUMINT</data-type> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>from_repository</name> - <data-type>MEDIUMINT</data-type> + <name>gpg_key</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>to_repository</name> + <name>action</name> <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> - <column> - <name>upstream_package_repository</name> - <data-type>SMALLINT</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> </column-list> </table> </item> - <item type="database-table" id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"> + <item type="database-table" id="{f31249ea-ab19-45a4-9427-1854379ad8e7}"> <position> - <x>788</x> - <y>281</y> + <x>106</x> + <y>-51</y> </position> <table> - <name>repository_stabilities</name> + <name>gpg_keys</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>SMALLINT</data-type> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>name</name> - <data-type>VARCHAR(32)</data-type> + <name>fingerprint</name> + <data-type>VARCHAR(40)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>bugtracker_category</name> - <data-type>VARCHAR(32)</data-type> - <required>False</required> + <name>owner</name> + <data-type>MEDIUMINT</data-type> + <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"> + <item type="database-table" id="{75e4ebd8-5915-4aff-8316-0c542d3953da}"> <position> - <x>53</x> - <y>501</y> + <x>258</x> + <y>-44</y> </position> <table> - <name>build_dependency_loops</name> + <name>persons</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>BIGINT</data-type> - <required>True</required> - <primary-key>True</primary-key> - </column> - <column> - <name>loop</name> <data-type>MEDIUMINT</data-type> <required>True</required> - <primary-key>False</primary-key> + <primary-key>True</primary-key> </column> <column> - <name>build_assignment</name> - <data-type>BIGINT</data-type> + <name>name</name> + <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{be821d83-a9b4-4c0c-8e1b-433730200714}"> + <item type="database-table" id="{36980651-4f03-4748-aee8-1f9211aaafde}"> <position> - <x>540</x> - <y>-64</y> + <x>788</x> + <y>-60</y> </position> <table> - <name>dependency_types</name> + <name>todo_links</name> <color>#ffffff</color> <column-list> <column> - <name>id</name> - <data-type>SMALLINT</data-type> - <required>True</required> - <primary-key>True</primary-key> - </column> - <column> - <name>name</name> - <data-type>VARCHAR(32)</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>relevant_for_building</name> - <data-type>BIT</data-type> + <name>dependent</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>relevant_for_binary_packages</name> - <data-type>BIT</data-type> + <name>depending_on</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"> + <item type="database-table" id="{dc01c567-d657-4db7-8a55-d2763ed00cee}"> <position> - <x>348</x> - <y>-60</y> + <x>945</x> + <y>-70</y> </position> <table> - <name>dependencies</name> + <name>todos</name> <color>#ffffff</color> <column-list> <column> @@ -288,33 +210,39 @@ <primary-key>True</primary-key> </column> <column> - <name>dependent</name> - <data-type>BIGINT</data-type> + <name>file</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>depending_on</name> - <data-type>BIGINT</data-type> + <name>line</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>dependency_type</name> - <data-type>SMALLINT</data-type> + <name>description</name> + <data-type>TEXT</data-type> <required>True</required> <primary-key>False</primary-key> </column> + <column> + <name>importance</name> + <data-type>SMALLINT</data-type> + <required>False</required> + <primary-key>False</primary-key> + </column> </column-list> </table> </item> - <item type="database-table" id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"> + <item type="database-table" id="{9085c36f-5884-41c8-9ca8-9d53973e657d}"> <position> - <x>557</x> - <y>30</y> + <x>777</x> + <y>32</y> </position> <table> - <name>install_targets</name> + <name>statitstics</name> <color>#ffffff</color> <column-list> <column> @@ -324,135 +252,111 @@ <primary-key>True</primary-key> </column> <column> - <name>name</name> - <data-type>VARCHAR(64)</data-type> + <name>date</name> + <data-type>TIMESTAMP</data-type> <required>True</required> <primary-key>False</primary-key> </column> - </column-list> - </table> - </item> - <item type="database-table" id="{04f424bf-6465-478b-9529-0038615b51d9}"> - <position> - <x>415</x> - <y>321</y> - </position> - <table> - <name>architectures</name> - <color>#ffffff</color> - <column-list> <column> - <name>id</name> - <data-type>SMALLINT</data-type> + <name>stable_packages_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> - <primary-key>True</primary-key> + <primary-key>False</primary-key> </column> <column> - <name>name</name> - <data-type>VARCHAR(16)</data-type> + <name>pending_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> - </column-list> - </table> - </item> - <item type="database-table" id="{7c210122-c51d-4724-b7cc-22f143bc47ac}"> - <position> - <x>226</x> - <y>473</y> - </position> - <table> - <name>package_sources</name> - <color>#ffffff</color> - <column-list> <column> - <name>id</name> - <data-type>BIGINT</data-type> + <name>staging_packages_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> - <primary-key>True</primary-key> + <primary-key>False</primary-key> </column> <column> - <name>pkgbase</name> - <data-type>VARCHAR(64)</data-type> + <name>testing_packages_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>git_revision</name> - <data-type>VARCHAR(40)</data-type> + <name>broken_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>mod_git_revision</name> - <data-type>VARCHAR(40)</data-type> + <name>dependency_loops_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>upsream_package_repository</name> - <data-type>SMALLINT</data-type> + <name>dependency_looped_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>uses_upstream</name> - <data-type>BIT</data-type> + <name>locked_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>uses_modification</name> - <data-type>BIT</data-type> + <name>blocked_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>commit_time</name> - <data-type>TIMESTAMP</data-type> + <name>next_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"> + <item type="database-table" id="{92f54126-a433-458e-80b7-67235e560334}"> <position> - <x>539</x> - <y>533</y> + <x>844</x> + <y>427</y> </position> <table> - <name>upstream_repositories</name> + <name>repository_stability_relations</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>SMALLINT</data-type> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>name</name> - <data-type>VARCHAR(64)</data-type> + <name>more_stable</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>git_repository</name> - <data-type>SMALLINT</data-type> + <name>less_stable</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"> + <item type="database-table" id="{7b159780-7f39-45a7-9557-046874a57e43}"> <position> - <x>770</x> - <y>508</y> + <x>-53</x> + <y>240</y> </position> <table> - <name>git_repositories</name> + <name>fail_reasons</name> <color>#ffffff</color> <column-list> <column> @@ -463,38 +367,32 @@ </column> <column> <name>name</name> - <data-type>VARCHAR(64)</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>url</name> - <data-type>VARCHAR(128)</data-type> + <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>directory</name> - <data-type>VARCHAR(128)</data-type> + <name>identifier</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>head</name> - <data-type>VARCHAR(40)</data-type> + <name>severity</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"> + <item type="database-table" id="{a774fcb7-1193-4b57-947c-135212695915}"> <position> - <x>549</x> - <y>301</y> + <x>-17</x> + <y>342</y> </position> <table> - <name>repositories</name> + <name>failed_builds</name> <color>#ffffff</color> <column-list> <column> @@ -504,69 +402,45 @@ <primary-key>True</primary-key> </column> <column> - <name>name</name> - <data-type>VARCHAR(64)</data-type> + <name>build_slave</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>stability</name> - <data-type>SMALLINT</data-type> + <name>build_assignment</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>is_on_master_mirror</name> - <data-type>BIT</data-type> + <name>date</name> + <data-type>TIMESTAMP</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>architecture</name> + <name>reason</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> - </column-list> - </table> - </item> - <item type="database-table" id="{f8caa2d5-11ba-485c-b273-8183713896bf}"> - <position> - <x>549</x> - <y>105</y> - </position> - <table> - <name>install_target_providers</name> - <color>#ffffff</color> - <column-list> - <column> - <name>id</name> - <data-type>BIGINT</data-type> - <required>True</required> - <primary-key>True</primary-key> - </column> - <column> - <name>package</name> - <data-type>BIGINT</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> <column> - <name>install_target</name> - <data-type>BIGINT</data-type> + <name>log_file</name> + <data-type>VARCHAR(512)</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"> + <item type="database-table" id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"> <position> - <x>360</x> - <y>56</y> + <x>187</x> + <y>311</y> </position> <table> - <name>binary_packages</name> + <name>build_assignments</name> <color>#ffffff</color> <column-list> <column> @@ -576,71 +450,47 @@ <primary-key>True</primary-key> </column> <column> - <name>build_assignment</name> + <name>package_source</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>epoch</name> - <data-type>MEDIUMINT</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>pkgver</name> - <data-type>VARCHAR(64)</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>pkgrel</name> - <data-type>MEDIUMINT</data-type> + <name>architecture</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>sub_pkgrel</name> - <data-type>MEDIUMINT</data-type> - <required>True</required> + <name>is_blocked</name> + <data-type>VARCHAR(128)</data-type> + <required>False</required> <primary-key>False</primary-key> </column> <column> - <name>has_issues</name> - <data-type>BIT</data-type> - <required>True</required> + <name>is_black_listed</name> + <data-type>VARCHAR(128)</data-type> + <required>False</required> <primary-key>False</primary-key> </column> <column> - <name>is_tested</name> + <name>is_broken</name> <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>pkgname</name> - <data-type>VARCHAR(64)</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>architecture</name> + <name>priority</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>sha512sum</name> - <data-type>VARCHAR(128)</data-type> + <name>return_date</name> + <data-type>TIMESTAMP</data-type> <required>False</required> <primary-key>False</primary-key> </column> - <column> - <name>sub_pkgrel_omitted</name> - <data-type>BIT</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> </column-list> </table> </item> @@ -710,13 +560,13 @@ </column-list> </table> </item> - <item type="database-table" id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"> + <item type="database-table" id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"> <position> - <x>247</x> - <y>291</y> + <x>360</x> + <y>56</y> </position> <table> - <name>build_assignments</name> + <name>binary_packages</name> <color>#ffffff</color> <column-list> <column> @@ -726,105 +576,153 @@ <primary-key>True</primary-key> </column> <column> - <name>package_source</name> + <name>build_assignment</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>architecture</name> - <data-type>SMALLINT</data-type> + <name>epoch</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>is_blocked</name> - <data-type>VARCHAR(128)</data-type> - <required>False</required> + <name>pkgver</name> + <data-type>VARCHAR(64)</data-type> + <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>is_black_listed</name> - <data-type>VARCHAR(128)</data-type> - <required>False</required> + <name>pkgrel</name> + <data-type>MEDIUMINT</data-type> + <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>is_broken</name> + <name>sub_pkgrel</name> + <data-type>MEDIUMINT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>has_issues</name> <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>priority</name> + <name>is_tested</name> + <data-type>BIT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>pkgname</name> + <data-type>VARCHAR(64)</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>architecture</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>return_date</name> - <data-type>TIMESTAMP</data-type> + <name>sha512sum</name> + <data-type>VARCHAR(128)</data-type> <required>False</required> <primary-key>False</primary-key> </column> + <column> + <name>sub_pkgrel_omitted</name> + <data-type>BIT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> </column-list> </table> </item> - <item type="database-table" id="{a774fcb7-1193-4b57-947c-135212695915}"> + <item type="database-table" id="{f8caa2d5-11ba-485c-b273-8183713896bf}"> <position> - <x>53</x> - <y>346</y> + <x>549</x> + <y>105</y> </position> <table> - <name>failed_builds</name> + <name>install_target_providers</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>MEDIUMINT</data-type> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>build_slave</name> - <data-type>MEDIUMINT</data-type> + <name>package</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>build_assignment</name> + <name>install_target</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item type="database-table" id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"> + <position> + <x>625</x> + <y>307</y> + </position> + <table> + <name>repositories</name> + <color>#ffffff</color> + <column-list> <column> - <name>date</name> - <data-type>TIMESTAMP</data-type> + <name>id</name> + <data-type>MEDIUMINT</data-type> + <required>True</required> + <primary-key>True</primary-key> + </column> + <column> + <name>name</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>reason</name> + <name>stability</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>log_file</name> - <data-type>VARCHAR(512)</data-type> + <name>is_on_master_mirror</name> + <data-type>BIT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>architecture</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{7b159780-7f39-45a7-9557-046874a57e43}"> + <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"> <position> - <x>-62</x> - <y>370</y> + <x>906</x> + <y>532</y> </position> <table> - <name>fail_reasons</name> + <name>git_repositories</name> <color>#ffffff</color> <column-list> <column> @@ -835,62 +733,68 @@ </column> <column> <name>name</name> - <data-type>VARCHAR(32)</data-type> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>identifier</name> - <data-type>VARCHAR(64)</data-type> + <name>url</name> + <data-type>VARCHAR(128)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>severity</name> - <data-type>SMALLINT</data-type> + <name>directory</name> + <data-type>VARCHAR(128)</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>head</name> + <data-type>VARCHAR(40)</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{92f54126-a433-458e-80b7-67235e560334}"> + <item type="database-table" id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"> <position> - <x>754</x> - <y>399</y> + <x>535</x> + <y>562</y> </position> <table> - <name>repository_stability_relations</name> + <name>upstream_repositories</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>MEDIUMINT</data-type> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>more_stable</name> - <data-type>MEDIUMINT</data-type> + <name>name</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>less_stable</name> - <data-type>MEDIUMINT</data-type> + <name>git_repository</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{9085c36f-5884-41c8-9ca8-9d53973e657d}"> + <item type="database-table" id="{7c210122-c51d-4724-b7cc-22f143bc47ac}"> <position> - <x>777</x> - <y>32</y> + <x>175</x> + <y>497</y> </position> <table> - <name>statitstics</name> + <name>package_sources</name> <color>#ffffff</color> <column-list> <column> @@ -900,81 +804,105 @@ <primary-key>True</primary-key> </column> <column> - <name>date</name> - <data-type>TIMESTAMP</data-type> + <name>pkgbase</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>stable_packages_count</name> - <data-type>MEDIUMINT</data-type> + <name>git_revision</name> + <data-type>VARCHAR(40)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>pending_tasks_count</name> - <data-type>MEDIUMINT</data-type> + <name>mod_git_revision</name> + <data-type>VARCHAR(40)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>staging_packages_count</name> - <data-type>MEDIUMINT</data-type> + <name>upsream_package_repository</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>testing_packages_count</name> - <data-type>MEDIUMINT</data-type> + <name>uses_upstream</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>broken_tasks_count</name> - <data-type>MEDIUMINT</data-type> + <name>uses_modification</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>dependency_loops_count</name> - <data-type>MEDIUMINT</data-type> + <name>commit_time</name> + <data-type>TIMESTAMP</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item type="database-table" id="{04f424bf-6465-478b-9529-0038615b51d9}"> + <position> + <x>399</x> + <y>289</y> + </position> + <table> + <name>architectures</name> + <color>#ffffff</color> + <column-list> <column> - <name>dependency_looped_tasks_count</name> - <data-type>MEDIUMINT</data-type> + <name>id</name> + <data-type>SMALLINT</data-type> <required>True</required> - <primary-key>False</primary-key> + <primary-key>True</primary-key> </column> <column> - <name>locked_tasks_count</name> - <data-type>MEDIUMINT</data-type> + <name>name</name> + <data-type>VARCHAR(16)</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item type="database-table" id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"> + <position> + <x>557</x> + <y>30</y> + </position> + <table> + <name>install_targets</name> + <color>#ffffff</color> + <column-list> <column> - <name>blocked_tasks_count</name> - <data-type>MEDIUMINT</data-type> + <name>id</name> + <data-type>BIGINT</data-type> <required>True</required> - <primary-key>False</primary-key> + <primary-key>True</primary-key> </column> <column> - <name>next_tasks_count</name> - <data-type>MEDIUMINT</data-type> + <name>name</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{dc01c567-d657-4db7-8a55-d2763ed00cee}"> + <item type="database-table" id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"> <position> - <x>945</x> - <y>-70</y> + <x>348</x> + <y>-60</y> </position> <table> - <name>todos</name> + <name>dependencies</name> <color>#ffffff</color> <column-list> <column> @@ -984,49 +912,85 @@ <primary-key>True</primary-key> </column> <column> - <name>file</name> - <data-type>VARCHAR(64)</data-type> + <name>dependent</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>line</name> - <data-type>MEDIUMINT</data-type> + <name>depending_on</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>description</name> - <data-type>TEXT</data-type> + <name>dependency_type</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item type="database-table" id="{be821d83-a9b4-4c0c-8e1b-433730200714}"> + <position> + <x>540</x> + <y>-64</y> + </position> + <table> + <name>dependency_types</name> + <color>#ffffff</color> + <column-list> <column> - <name>importance</name> + <name>id</name> <data-type>SMALLINT</data-type> - <required>False</required> + <required>True</required> + <primary-key>True</primary-key> + </column> + <column> + <name>name</name> + <data-type>VARCHAR(32)</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>relevant_for_building</name> + <data-type>BIT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>relevant_for_binary_packages</name> + <data-type>BIT</data-type> + <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{36980651-4f03-4748-aee8-1f9211aaafde}"> + <item type="database-table" id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"> <position> - <x>788</x> - <y>-60</y> + <x>-21</x> + <y>537</y> </position> <table> - <name>todo_links</name> + <name>build_dependency_loops</name> <color>#ffffff</color> <column-list> <column> - <name>dependent</name> + <name>id</name> <data-type>BIGINT</data-type> <required>True</required> + <primary-key>True</primary-key> + </column> + <column> + <name>loop</name> + <data-type>MEDIUMINT</data-type> + <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>depending_on</name> + <name>build_assignment</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -1034,18 +998,18 @@ </column-list> </table> </item> - <item type="database-table" id="{75e4ebd8-5915-4aff-8316-0c542d3953da}"> + <item type="database-table" id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"> <position> - <x>258</x> - <y>-44</y> + <x>856</x> + <y>280</y> </position> <table> - <name>persons</name> + <name>repository_stabilities</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>MEDIUMINT</data-type> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> @@ -1055,46 +1019,58 @@ <required>True</required> <primary-key>False</primary-key> </column> + <column> + <name>bugtracker_category</name> + <data-type>VARCHAR(32)</data-type> + <required>False</required> + <primary-key>False</primary-key> + </column> </column-list> </table> </item> - <item type="database-table" id="{f31249ea-ab19-45a4-9427-1854379ad8e7}"> + <item type="database-table" id="{d823ab09-1c04-44ee-ad4b-6802208967ff}"> <position> - <x>106</x> - <y>-51</y> + <x>585</x> + <y>455</y> </position> <table> - <name>gpg_keys</name> + <name>repository_moves</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>BIGINT</data-type> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>fingerprint</name> - <data-type>VARCHAR(40)</data-type> + <name>from_repository</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>owner</name> + <name>to_repository</name> <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> + <column> + <name>upstream_package_repository</name> + <data-type>SMALLINT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> </column-list> </table> </item> - <item type="database-table" id="{b5671c08-e24a-4293-b983-3c86b1a6d622}"> + <item type="database-table" id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"> <position> - <x>68</x> - <y>49</y> + <x>-55</x> + <y>-72</y> </position> <table> - <name>allowed_email_actions</name> + <name>email_log</name> <color>#ffffff</color> <column-list> <column> @@ -1104,51 +1080,93 @@ <primary-key>True</primary-key> </column> <column> - <name>gpg_key</name> - <data-type>BIGINT</data-type> + <name>date</name> + <data-type>TIMESTAMP</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>success</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> <name>action</name> <data-type>MEDIUMINT</data-type> - <required>True</required> + <required>False</required> + <primary-key>False</primary-key> + </column> + <column> + <name>count</name> + <data-type>MEDIUMINT</data-type> + <required>False</required> + <primary-key>False</primary-key> + </column> + <column> + <name>gpg_key</name> + <data-type>BIGINT</data-type> + <required>False</required> + <primary-key>False</primary-key> + </column> + <column> + <name>comment</name> + <data-type>TEXT</data-type> + <required>False</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{6180fcbf-5069-4d86-8919-fd39394f1813}"> + <item type="database-table" id="{5f12db03-a8bb-4467-bab6-a57e545b9081}"> <position> - <x>-68</x> - <y>71</y> + <x>-52</x> + <y>134</y> </position> <table> - <name>email_actions</name> + <name>ssh_log</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>MEDIUMINT</data-type> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>name</name> + <name>date</name> + <data-type>TIMESTAMP</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>build_slave</name> + <data-type>MEDIUMINT</data-type> + <required>False</required> + <primary-key>False</primary-key> + </column> + <column> + <name>action</name> <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> + <column> + <name>parameters</name> + <data-type>TEXT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> </column-list> </table> </item> - <item type="database-table" id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"> + <item type="database-table" id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"> <position> - <x>237</x> - <y>40</y> + <x>543</x> + <y>182</y> </position> <table> - <name>ssh_keys</name> + <name>binary_packages_in_repositories</name> <color>#ffffff</color> <column-list> <column> @@ -1158,46 +1176,91 @@ <primary-key>True</primary-key> </column> <column> - <name>owner</name> + <name>package</name> + <data-type>BIGINT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>repository</name> <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>fingerprint</name> - <data-type>TEXT</data-type> + <name>is_to_be_deleted</name> + <data-type>BIT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>last_moved</name> + <data-type>TIMESTAMP</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}"> + <item type="database-relationship" id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}"> <line> <connector-list> <connector> <position> - <x>647.922</x> - <y>273.812</y> + <x>420.714</x> + <y>400</y> + </position> + <angle>90</angle> + <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/> + </connector> + <connector> + <position> + <x>430.516</x> + <y>338.812</y> </position> <angle>270</angle> - <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> + </connector-list> + </line> + <relationship> + <cardinality>OneToOne</cardinality> + <modality> + <child>Mandatory</child> + <parent>Mandatory</parent> + </modality> + <columns> + <child>1</child> + <parent>0</parent> + </columns> + </relationship> + </item> + <item type="database-relationship" id="{30a694b2-681f-44ae-90bb-911220d65737}"> + <line> + <connector-list> <connector> <position> - <x>633.703</x> - <y>301</y> + <x>481.427</x> + <y>400</y> </position> <angle>90</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/> + </connector> + <connector> + <position> + <x>462.031</x> + <y>338.812</y> + </position> + <angle>270</angle> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> <relationship> - <cardinality>OneToMany</cardinality> + <cardinality>OneToOne</cardinality> <modality> - <child>Optional</child> - <parent>Optional</parent> + <child>Mandatory</child> + <parent>Mandatory</parent> </modality> <columns> <child>2</child> @@ -1205,24 +1268,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}"> + <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}"> <line> <connector-list> <connector> <position> - <x>543</x> - <y>227.906</y> + <x>625</x> + <y>352.906</y> </position> <angle>180</angle> - <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> <connector> <position> - <x>525.859</x> - <y>182.542</y> + <x>493.547</x> + <y>313.906</y> </position> <angle>0</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> @@ -1233,30 +1296,63 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>4</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}"> + <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}"> <line> <connector-list> <connector> <position> - <x>153.531</x> - <y>180.906</y> + <x>290.109</x> + <y>40</y> </position> - <angle>0</angle> - <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/> + <angle>90</angle> + <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> </connector> <connector> <position> - <x>185</x> - <y>195.906</y> + <x>293.289</x> + <y>5.8125</y> </position> - <angle>180</angle> + <angle>270</angle> + <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> + </connector> + </connector-list> + </line> + <relationship> + <cardinality>OneToOne</cardinality> + <modality> + <child>Mandatory</child> + <parent>Mandatory</parent> + </modality> + <columns> + <child>1</child> + <parent>0</parent> + </columns> + </relationship> + </item> + <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}"> + <line> + <connector-list> + <connector> + <position> + <x>255.727</x> + <y>122</y> + </position> + <angle>90</angle> <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> + <connector> + <position> + <x>290.109</x> + <y>103.812</y> + </position> + <angle>270</angle> + <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> + </connector> </connector-list> </line> <relationship> @@ -1271,24 +1367,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}"> + <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}"> <line> <connector-list> <connector> <position> - <x>612.133</x> - <y>504.812</y> + <x>-9.85156</x> + <y>47.8125</y> </position> <angle>270</angle> - <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> + <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> </connector> <connector> <position> - <x>613.727</x> - <y>533</y> + <x>-10.2734</x> + <y>73</y> </position> <angle>90</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> </connector> </connector-list> </line> @@ -1304,24 +1400,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}"> + <item type="database-relationship" id="{af592aac-17cd-415f-99e8-9cf164311215}"> <line> <connector-list> <connector> <position> - <x>572.755</x> - <y>427</y> + <x>68</x> + <y>80.9062</y> </position> - <angle>90</angle> - <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> + <angle>180</angle> + <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> </connector> <connector> <position> - <x>605.469</x> - <y>392.812</y> + <x>38.4531</x> + <y>97.9062</y> </position> - <angle>270</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <angle>0</angle> + <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> </connector> </connector-list> </line> @@ -1332,29 +1428,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}"> + <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}"> <line> <connector-list> <connector> <position> - <x>651.51</x> - <y>427</y> + <x>142.789</x> + <y>49</y> </position> <angle>90</angle> - <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> + <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> </connector> <connector> <position> - <x>661.938</x> - <y>392.812</y> + <x>159.109</x> + <y>12.8125</y> </position> <angle>270</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> </connector> </connector-list> </line> @@ -1365,29 +1461,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}"> + <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}"> <line> <connector-list> <connector> <position> - <x>470.573</x> - <y>245.812</y> + <x>35.2969</x> + <y>-12.0938</y> </position> - <angle>270</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <angle>0</angle> + <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> </connector> <connector> <position> - <x>462.273</x> - <y>321</y> + <x>106</x> + <y>-19.0938</y> </position> - <angle>90</angle> - <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> + <angle>180</angle> + <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> </connector> </connector-list> </line> @@ -1398,29 +1494,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>9</child> + <child>5</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}"> + <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}"> <line> <connector-list> <connector> <position> - <x>499.672</x> - <y>-34.0625</y> + <x>212.219</x> + <y>-19.0938</y> </position> <angle>0</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> </connector> <connector> <position> - <x>540</x> - <y>-25.0938</y> + <x>258</x> + <y>-19.0938</y> </position> <angle>180</angle> - <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/> + <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> </connector> </connector-list> </line> @@ -1431,29 +1527,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>3</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}"> + <item type="database-relationship" id="{172204a1-76e9-45fc-826f-b3d174112734}"> <line> <connector-list> <connector> <position> - <x>718.406</x> - <y>346.906</y> + <x>915.234</x> + <y>-43.3958</y> </position> <angle>0</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> </connector> <connector> <position> - <x>788</x> - <y>312.906</y> + <x>945</x> + <y>-39.3958</y> </position> <angle>180</angle> - <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> + <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> </connector> </connector-list> </line> @@ -1464,29 +1560,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>0</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{ab992baa-6a2c-441b-a290-da42a791eb95}"> + <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}"> <line> <connector-list> <connector> <position> - <x>499.672</x> - <y>-8.125</y> + <x>915.234</x> + <y>-26.7917</y> </position> <angle>0</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> </connector> <connector> <position> - <x>557</x> - <y>54.9062</y> + <x>945</x> + <y>-8.79167</y> </position> <angle>180</angle> - <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> + <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> </connector> </connector-list> </line> @@ -1497,29 +1593,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}"> + <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}"> <line> <connector-list> <connector> <position> - <x>627.109</x> - <y>105</y> + <x>906.656</x> + <y>427</y> </position> <angle>90</angle> - <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> + <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> </connector> <connector> <position> - <x>607.016</x> - <y>79.8125</y> + <x>908.635</x> + <y>343.812</y> </position> <angle>270</angle> - <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> + <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> </connector> </connector-list> </line> @@ -1535,24 +1631,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}"> + <item type="database-relationship" id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}"> <line> <connector-list> <connector> <position> - <x>423.836</x> - <y>17.8125</y> + <x>969.312</x> + <y>427</y> </position> - <angle>270</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <angle>90</angle> + <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> </connector> <connector> <position> - <x>442.93</x> - <y>56</y> + <x>961.271</x> + <y>343.812</y> </position> - <angle>90</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <angle>270</angle> + <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> </connector> </connector-list> </line> @@ -1568,24 +1664,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}"> + <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}"> <line> <connector-list> <connector> <position> - <x>549</x> - <y>136.906</y> + <x>33.5729</x> + <y>342</y> </position> - <angle>180</angle> - <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> + <angle>90</angle> + <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> </connector> <connector> <position> - <x>525.859</x> - <y>119.271</y> + <x>-5.28125</x> + <y>317.812</y> </position> - <angle>0</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <angle>270</angle> + <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/> </connector> </connector-list> </line> @@ -1596,29 +1692,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>4</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}"> + <item type="database-relationship" id="{35556854-c6c3-45e8-9e10-bd5150680fd2}"> <line> <connector-list> <connector> <position> - <x>456.531</x> - <y>539.906</y> + <x>134.719</x> + <y>394.906</y> </position> <angle>0</angle> - <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> + <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> </connector> <connector> <position> - <x>539</x> - <y>564.906</y> + <x>187</x> + <y>377.906</y> </position> <angle>180</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -1629,29 +1725,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>4</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}"> + <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}"> <line> <connector-list> <connector> <position> - <x>688.453</x> - <y>564.906</y> + <x>84.1458</x> + <y>342</y> </position> - <angle>0</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <angle>90</angle> + <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> </connector> <connector> <position> - <x>770</x> - <y>553.906</y> + <x>185</x> + <y>220.542</y> </position> <angle>180</angle> - <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> </connector-list> </line> @@ -1662,29 +1758,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}"> + <item type="database-relationship" id="{40654aec-f5e1-4d82-a528-102a76a971d3}"> <line> <connector-list> <connector> <position> - <x>340.948</x> - <y>424.812</y> + <x>60.1953</x> + <y>537</y> </position> - <angle>270</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <angle>90</angle> + <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/> </connector> <connector> <position> - <x>341.266</x> - <y>473</y> + <x>233.974</x> + <y>444.812</y> </position> - <angle>90</angle> - <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> + <angle>270</angle> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -1695,29 +1791,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}"> + <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}"> <line> <connector-list> <connector> <position> - <x>387.922</x> - <y>357.906</y> + <x>255.727</x> + <y>269.812</y> </position> - <angle>0</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <angle>270</angle> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> <connector> <position> - <x>415</x> - <y>345.906</y> + <x>233.974</x> + <y>311</y> </position> - <angle>180</angle> - <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> + <angle>90</angle> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -1728,7 +1824,7 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>3</child> <parent>0</parent> </columns> </relationship> @@ -1746,8 +1842,8 @@ </connector> <connector> <position> - <x>340.948</x> - <y>291</y> + <x>280.948</x> + <y>311</y> </position> <angle>90</angle> <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> @@ -1766,24 +1862,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}"> + <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}"> <line> <connector-list> <connector> <position> - <x>279.302</x> - <y>269.812</y> + <x>327.922</x> + <y>377.906</y> </position> - <angle>270</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <angle>0</angle> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> <connector> <position> - <x>293.974</x> - <y>291</y> + <x>399</x> + <y>313.906</y> </position> - <angle>90</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <angle>180</angle> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> @@ -1794,29 +1890,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>3</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{40654aec-f5e1-4d82-a528-102a76a971d3}"> + <item type="database-relationship" id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}"> <line> <connector-list> <connector> <position> - <x>134.195</x> - <y>501</y> + <x>280.948</x> + <y>444.812</y> </position> - <angle>90</angle> - <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/> + <angle>270</angle> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> <connector> <position> - <x>293.974</x> - <y>424.812</y> + <x>290.266</x> + <y>497</y> </position> - <angle>270</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <angle>90</angle> + <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> </connector> </connector-list> </line> @@ -1827,29 +1923,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}"> + <item type="database-relationship" id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}"> <line> <connector-list> <connector> <position> - <x>128.859</x> - <y>346</y> + <x>684.453</x> + <y>593.906</y> </position> - <angle>90</angle> - <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> + <angle>0</angle> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> <connector> <position> - <x>232.151</x> - <y>269.812</y> + <x>906</x> + <y>577.906</y> </position> - <angle>270</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <angle>180</angle> + <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/> </connector> </connector-list> </line> @@ -1860,29 +1956,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{35556854-c6c3-45e8-9e10-bd5150680fd2}"> + <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}"> <line> <connector-list> <connector> <position> - <x>204.719</x> - <y>398.906</y> + <x>405.531</x> + <y>563.906</y> </position> <angle>0</angle> - <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> + <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> </connector> <connector> <position> - <x>247</x> - <y>357.906</y> + <x>535</x> + <y>593.906</y> </position> <angle>180</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> </connector-list> </line> @@ -1893,29 +1989,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>4</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}"> + <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}"> <line> <connector-list> <connector> <position> - <x>53</x> - <y>398.906</y> + <x>549</x> + <y>136.906</y> </position> <angle>180</angle> - <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> + <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> </connector> <connector> <position> - <x>33.4375</x> - <y>408.906</y> + <x>525.859</x> + <y>119.271</y> </position> <angle>0</angle> - <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> </connector-list> </line> @@ -1926,29 +2022,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>4</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}"> + <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}"> <line> <connector-list> <connector> <position> - <x>816.656</x> - <y>399</y> + <x>423.836</x> + <y>17.8125</y> </position> - <angle>90</angle> - <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> + <angle>270</angle> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> </connector> <connector> <position> - <x>840.635</x> - <y>344.812</y> + <x>442.93</x> + <y>56</y> </position> - <angle>270</angle> - <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> + <angle>90</angle> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> </connector-list> </line> @@ -1964,24 +2060,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}"> + <item type="database-relationship" id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}"> <line> <connector-list> <connector> <position> - <x>879.312</x> - <y>399</y> + <x>627.109</x> + <y>105</y> </position> <angle>90</angle> - <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> + <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> </connector> <connector> <position> - <x>893.271</x> - <y>344.812</y> + <x>607.016</x> + <y>79.8125</y> </position> <angle>270</angle> - <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> + <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> </connector> </connector-list> </line> @@ -1997,24 +2093,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}"> + <item type="database-relationship" id="{ab992baa-6a2c-441b-a290-da42a791eb95}"> <line> <connector-list> <connector> <position> - <x>915.234</x> - <y>-43.3958</y> + <x>499.672</x> + <y>-8.125</y> </position> <angle>0</angle> - <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> </connector> <connector> <position> - <x>945</x> - <y>-39.3958</y> + <x>557</x> + <y>54.9062</y> </position> <angle>180</angle> - <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> + <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> </connector> </connector-list> </line> @@ -2025,29 +2121,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{172204a1-76e9-45fc-826f-b3d174112734}"> + <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}"> <line> <connector-list> <connector> <position> - <x>915.234</x> - <y>-26.7917</y> + <x>794.406</x> + <y>352.906</y> </position> <angle>0</angle> - <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> <connector> <position> - <x>945</x> - <y>-8.79167</y> + <x>856</x> + <y>311.906</y> </position> <angle>180</angle> - <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> + <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> </connector> </connector-list> </line> @@ -2058,29 +2154,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>0</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}"> + <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}"> <line> <connector-list> <connector> <position> - <x>212.219</x> - <y>-19.0938</y> + <x>499.672</x> + <y>-34.0625</y> </position> <angle>0</angle> - <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> </connector> <connector> <position> - <x>258</x> - <y>-19.0938</y> + <x>540</x> + <y>-25.0938</y> </position> <angle>180</angle> - <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> + <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/> </connector> </connector-list> </line> @@ -2091,29 +2187,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>3</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}"> + <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}"> <line> <connector-list> <connector> <position> - <x>35.2969</x> - <y>-12.0938</y> + <x>470.573</x> + <y>245.812</y> </position> - <angle>0</angle> - <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> + <angle>270</angle> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> <connector> <position> - <x>106</x> - <y>-19.0938</y> + <x>446.273</x> + <y>289</y> </position> - <angle>180</angle> - <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> + <angle>90</angle> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> @@ -2124,29 +2220,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>5</child> + <child>9</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}"> + <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}"> <line> <connector-list> <connector> <position> - <x>142.789</x> - <y>49</y> + <x>663.755</x> + <y>455</y> </position> <angle>90</angle> - <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> + <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> </connector> <connector> <position> - <x>159.109</x> - <y>12.8125</y> + <x>681.469</x> + <y>398.812</y> </position> <angle>270</angle> - <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> </connector-list> </line> @@ -2157,29 +2253,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{af592aac-17cd-415f-99e8-9cf164311215}"> + <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}"> <line> <connector-list> <connector> <position> - <x>68</x> - <y>80.9062</y> + <x>742.51</x> + <y>455</y> </position> - <angle>180</angle> - <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> + <angle>90</angle> + <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> </connector> <connector> <position> - <x>29.4531</x> - <y>95.9062</y> + <x>737.938</x> + <y>398.812</y> </position> - <angle>0</angle> - <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> + <angle>270</angle> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> </connector-list> </line> @@ -2190,29 +2286,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}"> + <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}"> <line> <connector-list> <connector> <position> - <x>-9.85156</x> - <y>47.8125</y> + <x>703.133</x> + <y>532.812</y> </position> <angle>270</angle> - <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> + <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> </connector> <connector> <position> - <x>-19.2734</x> - <y>71</y> + <x>609.727</x> + <y>562</y> </position> <angle>90</angle> - <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> </connector-list> </line> @@ -2228,24 +2324,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}"> + <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}"> <line> <connector-list> <connector> <position> - <x>255.727</x> - <y>122</y> + <x>59.5312</x> + <y>179.906</y> </position> - <angle>90</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <angle>0</angle> + <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/> </connector> <connector> <position> - <x>290.109</x> - <y>103.812</y> + <x>185</x> + <y>171.271</y> </position> - <angle>270</angle> - <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> + <angle>180</angle> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> </connector-list> </line> @@ -2261,24 +2357,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}"> + <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}"> <line> <connector-list> <connector> <position> - <x>290.109</x> - <y>40</y> + <x>543</x> + <y>227.906</y> </position> - <angle>90</angle> - <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> + <angle>180</angle> + <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> </connector> <connector> <position> - <x>293.289</x> - <y>5.8125</y> + <x>525.859</x> + <y>182.542</y> </position> - <angle>270</angle> - <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> + <angle>0</angle> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> </connector-list> </line> @@ -2294,35 +2390,35 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}"> + <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}"> <line> <connector-list> <connector> <position> - <x>549</x> - <y>346.906</y> + <x>647.922</x> + <y>273.812</y> </position> - <angle>180</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <angle>270</angle> + <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> </connector> <connector> <position> - <x>509.547</x> - <y>345.906</y> + <x>709.703</x> + <y>307</y> </position> - <angle>0</angle> - <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> + <angle>90</angle> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> </connector-list> </line> <relationship> - <cardinality>OneToOne</cardinality> + <cardinality>OneToMany</cardinality> <modality> - <child>Mandatory</child> - <parent>Mandatory</parent> + <child>Optional</child> + <parent>Optional</parent> </modality> <columns> - <child>4</child> + <child>2</child> <parent>0</parent> </columns> </relationship> diff --git a/misc/database-layout.dump b/misc/database-layout.dump index 0cd7493..e4afcba 100644 --- a/misc/database-layout.dump +++ b/misc/database-layout.dump @@ -333,6 +333,16 @@ allowed_email_actions CREATE TABLE `allowed_email_actions` ( CONSTRAINT `allowed_email_actions_ibfk_1` FOREIGN KEY (`action`) REFERENCES `email_actions` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `allowed_email_actions_ibfk_2` FOREIGN KEY (`gpg_key`) REFERENCES `gpg_keys` (`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci +architecture_compatibilities CREATE TABLE `architecture_compatibilities` ( + `id` mediumint(9) NOT NULL AUTO_INCREMENT, + `built_for` smallint(6) NOT NULL, + `runs_on` smallint(6) NOT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `content` (`built_for`,`runs_on`), + KEY `architecture_compatibilities_ibfk_2` (`runs_on`), + CONSTRAINT `architecture_compatibilities_ibfk_1` FOREIGN KEY (`built_for`) REFERENCES `architectures` (`id`) ON DELETE CASCADE ON UPDATE CASCADE, + CONSTRAINT `architecture_compatibilities_ibfk_2` FOREIGN KEY (`runs_on`) REFERENCES `architectures` (`id`) ON DELETE CASCADE ON UPDATE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci architectures CREATE TABLE `architectures` ( `id` smallint(6) NOT NULL AUTO_INCREMENT, `name` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL, @@ -638,6 +648,10 @@ upstream_repositories CREATE TABLE `upstream_repositories` ( INSERT INTO `architectures` VALUES (1,'any'), (2,'i686'); +INSERT INTO `architecture_compatibilities` VALUES + (1,1,1), + (3,1,2), + (2,2,2); INSERT INTO `dependency_types` VALUES (2,'run','1','1'), (3,'check','\0','\0'), |