diff options
| -rw-r--r-- | misc/database-layout.dmf | 1898 | ||||
| -rw-r--r-- | misc/database-layout.dump | 1 |
2 files changed, 953 insertions, 946 deletions
diff --git a/misc/database-layout.dmf b/misc/database-layout.dmf index ab07939..c310699 100644 --- a/misc/database-layout.dmf +++ b/misc/database-layout.dmf @@ -2,13 +2,13 @@ <diagram xmlns="http://oxygene.sk/ns/diagram/1/"> <notation>Relational</notation> <item-list> - <item type="database-table" id="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}"> + <item id="{bb59ebca-0255-40dd-91b4-68bd2e110447}" type="database-table"> <position> - <x>632</x> - <y>498</y> + <x>901</x> + <y>641</y> </position> <table> - <name>upstream_packages</name> + <name>mirror_statuses</name> <color>#ffffff</color> <column-list> <column> @@ -18,159 +18,123 @@ <primary-key>True</primary-key> </column> <column> - <name>pkgname</name> - <data-type>VARCHAR(64)</data-type> + <name>protocol</name> + <data-type>VARCHAR(8)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>epoch</name> - <data-type>MEDIUMINT</data-type> + <name>url</name> + <data-type>VARCHAR(128)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>pkgver</name> + <name>country</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>country_code</name> + <data-type>VARCHAR(4)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>architecture</name> - <data-type>VARCHAR(6)</data-type> + <name>last_sync</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>repository</name> - <data-type>SMALLINT</data-type> + <name>start</name> + <data-type>FLOAT</data-type> <required>True</required> <primary-key>False</primary-key> </column> - </column-list> - </table> - </item> - <item type="database-table" id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"> - <position> - <x>-23</x> - <y>750</y> - </position> - <table> - <name>toolchain_order</name> - <color>#ffffff</color> - <column-list> <column> - <name>number</name> - <data-type>SMALLINT</data-type> - <required>True</required> - <primary-key>True</primary-key> - </column> - <column> - <name>pkgbase</name> - <data-type>VARCHAR(64)</data-type> + <name>stop</name> + <data-type>FLOAT</data-type> <required>True</required> <primary-key>False</primary-key> </column> - </column-list> - </table> - </item> - <item type="database-table" id="{a67b38a9-c701-412c-8292-5ef58536da85}"> - <position> - <x>483</x> - <y>57</y> - </position> - <table> - <name>versions</name> - <color>#ffffff</color> - <column-list> <column> - <name>id</name> - <data-type>BIGINT</data-type> + <name>isos</name> + <data-type>BIT</data-type> <required>True</required> - <primary-key>True</primary-key> + <primary-key>False</primary-key> </column> <column> - <name>order</name> - <data-type>BIGINT</data-type> + <name>ipv4</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>epoch</name> - <data-type>MEDIUMINT</data-type> + <name>ipv6</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>version</name> - <data-type>VARCHAR(32)</data-type> + <name>active</name> + <data-type>BIT</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 id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}" type="database-table"> <position> - <x>345</x> - <y>-71</y> + <x>656</x> + <y>380</y> </position> <table> - <name>dependencies</name> + <name>architecture_compatibilities</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>dependent</name> - <data-type>BIGINT</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>depending_on</name> - <data-type>BIGINT</data-type> + <name>built_for</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>dependency_type</name> + <name>runs_on</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>version</name> - <data-type>BIGINT</data-type> + <name>fully_compatible</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>version_relation</name> - <data-type>VARCHAR(2)</data-type> + <name>build_slave_compatible</name> + <data-type>BIT(n)</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"> + <item id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}" type="database-table"> <position> - <x>525</x> - <y>215</y> + <x>229</x> + <y>20</y> </position> <table> - <name>binary_packages_in_repositories</name> + <name>ssh_keys</name> <color>#ffffff</color> <column-list> <column> @@ -180,81 +144,51 @@ <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> + <name>owner</name> <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <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> + <name>fingerprint</name> + <data-type>TEXT</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 id="{6180fcbf-5069-4d86-8919-fd39394f1813}" type="database-table"> <position> - <x>-52</x> - <y>134</y> + <x>-54</x> + <y>70</y> </position> <table> - <name>ssh_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>build_slave</name> - <data-type>MEDIUMINT</data-type> - <required>False</required> - <primary-key>False</primary-key> - </column> - <column> - <name>action</name> + <name>name</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="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"> + <item id="{b5671c08-e24a-4293-b983-3c86b1a6d622}" type="database-table"> <position> - <x>-55</x> - <y>-72</y> + <x>68</x> + <y>42</y> </position> <table> - <name>email_log</name> + <name>allowed_email_actions</name> <color>#ffffff</color> <column-list> <column> @@ -264,92 +198,62 @@ <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>gpg_key</name> + <data-type>BIGINT</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> + <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{d823ab09-1c04-44ee-ad4b-6802208967ff}"> + <item id="{f31249ea-ab19-45a4-9427-1854379ad8e7}" type="database-table"> <position> - <x>793</x> - <y>497</y> + <x>106</x> + <y>-51</y> </position> <table> - <name>repository_moves</name> + <name>gpg_keys</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>fingerprint</name> + <data-type>VARCHAR(40)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>to_repository</name> + <name>owner</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 id="{75e4ebd8-5915-4aff-8316-0c542d3953da}" type="database-table"> <position> - <x>829</x> - <y>168</y> + <x>240</x> + <y>-66</y> </position> <table> - <name>repository_stabilities</name> + <name>persons</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> @@ -359,38 +263,26 @@ <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="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"> + <item id="{36980651-4f03-4748-aee8-1f9211aaafde}" type="database-table"> <position> - <x>-8</x> - <y>572</y> + <x>821</x> + <y>-49</y> </position> <table> - <name>build_dependency_loops</name> + <name>todo_links</name> <color>#ffffff</color> <column-list> <column> - <name>id</name> + <name>dependent</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>build_assignment</name> + <name>depending_on</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -398,49 +290,55 @@ </column-list> </table> </item> - <item type="database-table" id="{be821d83-a9b4-4c0c-8e1b-433730200714}"> + <item id="{dc01c567-d657-4db7-8a55-d2763ed00cee}" type="database-table"> <position> - <x>580</x> - <y>-71</y> + <x>971</x> + <y>-69</y> </position> <table> - <name>dependency_types</name> + <name>todos</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>file</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>relevant_for_building</name> - <data-type>BIT</data-type> + <name>line</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>relevant_for_binary_packages</name> - <data-type>BIT</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 id="{9085c36f-5884-41c8-9ca8-9d53973e657d}" type="database-table"> <position> - <x>653</x> - <y>21</y> + <x>357</x> + <y>455</y> </position> <table> - <name>install_targets</name> + <name>statitstics</name> <color>#ffffff</color> <column-list> <column> @@ -450,121 +348,85 @@ <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>382</x> - <y>378</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>173</x> - <y>709</y> - </position> - <table> - <name>package_sources</name> - <color>#ffffff</color> - <column-list> <column> - <name>id</name> - <data-type>BIGINT</data-type> + <name>pending_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>staging_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>testing_packages_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>tested_packages_count</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> + <name>broken_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>dependency_loops_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>dependency_looped_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>locked_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}"> - <position> - <x>729</x> - <y>684</y> - </position> - <table> - <name>upstream_repositories</name> - <color>#ffffff</color> - <column-list> <column> - <name>id</name> - <data-type>SMALLINT</data-type> + <name>blocked_tasks_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(64)</data-type> + <name>next_tasks_count</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>git_repository</name> + <name>architecture</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -572,83 +434,65 @@ </column-list> </table> </item> - <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"> + <item id="{92f54126-a433-458e-80b7-67235e560334}" type="database-table"> <position> - <x>598</x> - <y>736</y> + <x>816</x> + <y>57</y> </position> <table> - <name>git_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> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>url</name> - <data-type>VARCHAR(128)</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>directory</name> - <data-type>VARCHAR(128)</data-type> + <name>more_stable</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>head</name> - <data-type>VARCHAR(40)</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="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"> + <item id="{7b159780-7f39-45a7-9557-046874a57e43}" type="database-table"> <position> - <x>803</x> - <y>261</y> + <x>-53</x> + <y>240</y> </position> <table> - <name>repositories</name> + <name>fail_reasons</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>name</name> - <data-type>VARCHAR(64)</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>stability</name> - <data-type>SMALLINT</data-type> + <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>is_on_master_mirror</name> - <data-type>BIT</data-type> + <name>identifier</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>architecture</name> + <name>severity</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -656,41 +500,53 @@ </column-list> </table> </item> - <item type="database-table" id="{f8caa2d5-11ba-485c-b273-8183713896bf}"> + <item id="{a774fcb7-1193-4b57-947c-135212695915}" type="database-table"> <position> - <x>604</x> - <y>88</y> + <x>-19</x> + <y>365</y> </position> <table> - <name>install_target_providers</name> + <name>failed_builds</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>package</name> - <data-type>BIGINT</data-type> + <name>build_slave</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>install_target</name> + <name>build_assignment</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>version</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>install_target_is_group</name> + <name>reason</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> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>log_file_exists</name> <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -698,13 +554,13 @@ </column-list> </table> </item> - <item type="database-table" id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"> + <item id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}" type="database-table"> <position> - <x>299</x> - <y>99</y> + <x>164</x> + <y>408</y> </position> <table> - <name>binary_packages</name> + <name>build_assignments</name> <color>#ffffff</color> <column-list> <column> @@ -714,75 +570,57 @@ <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> + <name>currently_blocking</name> + <data-type>MEDIUMINT</data-type> + <required>False</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"> + <item id="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}" type="database-table"> <position> <x>118</x> <y>148</y> @@ -845,16 +683,22 @@ <required>True</required> <primary-key>False</primary-key> </column> + <column> + <name>access_allowed</name> + <data-type>BIT(n)</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> </column-list> </table> </item> - <item type="database-table" id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"> + <item id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}" type="database-table"> <position> - <x>164</x> - <y>408</y> + <x>299</x> + <y>99</y> </position> <table> - <name>build_assignments</name> + <name>binary_packages</name> <color>#ffffff</color> <column-list> <column> @@ -864,103 +708,109 @@ <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>currently_blocking</name> - <data-type>MEDIUMINT</data-type> - <required>False</required> + <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 id="{f8caa2d5-11ba-485c-b273-8183713896bf}" type="database-table"> <position> - <x>-19</x> - <y>365</y> + <x>604</x> + <y>88</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> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>build_assignment</name> + <name>package</name> <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>date</name> - <data-type>TIMESTAMP</data-type> - <required>True</required> - <primary-key>False</primary-key> - </column> - <column> - <name>reason</name> - <data-type>SMALLINT</data-type> + <name>install_target</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>log_file</name> - <data-type>VARCHAR(512)</data-type> + <name>version</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>log_file_exists</name> + <name>install_target_is_group</name> <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> @@ -968,35 +818,41 @@ </column-list> </table> </item> - <item type="database-table" id="{7b159780-7f39-45a7-9557-046874a57e43}"> + <item id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}" type="database-table"> <position> - <x>-53</x> - <y>240</y> + <x>803</x> + <y>261</y> </position> <table> - <name>fail_reasons</name> + <name>repositories</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(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>stability</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>severity</name> + <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> @@ -1004,197 +860,245 @@ </column-list> </table> </item> - <item type="database-table" id="{92f54126-a433-458e-80b7-67235e560334}"> + <item id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}" type="database-table"> <position> - <x>816</x> - <y>57</y> + <x>598</x> + <y>736</y> </position> <table> - <name>repository_stability_relations</name> + <name>git_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>url</name> + <data-type>VARCHAR(128)</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <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="{9085c36f-5884-41c8-9ca8-9d53973e657d}"> + <item id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}" type="database-table"> <position> - <x>357</x> - <y>455</y> + <x>729</x> + <y>684</y> </position> <table> - <name>statitstics</name> + <name>upstream_repositories</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>BIGINT</data-type> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>date</name> - <data-type>TIMESTAMP</data-type> + <name>name</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_repository</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item id="{7c210122-c51d-4724-b7cc-22f143bc47ac}" type="database-table"> + <position> + <x>173</x> + <y>709</y> + </position> + <table> + <name>package_sources</name> + <color>#ffffff</color> + <column-list> <column> - <name>pending_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>pending_packages_count</name> - <data-type>MEDIUMINT</data-type> + <name>pkgbase</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>staging_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>testing_packages_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>tested_packages_count</name> - <data-type>MEDIUMINT</data-type> + <name>upstream_package_repository</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>broken_tasks_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>dependency_loops_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_looped_tasks_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 id="{04f424bf-6465-478b-9529-0038615b51d9}" type="database-table"> + <position> + <x>382</x> + <y>378</y> + </position> + <table> + <name>architectures</name> + <color>#ffffff</color> + <column-list> <column> - <name>locked_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>blocked_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 id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}" type="database-table"> + <position> + <x>653</x> + <y>21</y> + </position> + <table> + <name>install_targets</name> + <color>#ffffff</color> + <column-list> <column> - <name>next_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>architecture</name> - <data-type>SMALLINT</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 id="{be821d83-a9b4-4c0c-8e1b-433730200714}" type="database-table"> <position> - <x>971</x> - <y>-69</y> + <x>580</x> + <y>-71</y> </position> <table> - <name>todos</name> + <name>dependency_types</name> <color>#ffffff</color> <column-list> <column> <name>id</name> - <data-type>BIGINT</data-type> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>True</primary-key> </column> <column> - <name>file</name> - <data-type>VARCHAR(64)</data-type> + <name>name</name> + <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>line</name> - <data-type>MEDIUMINT</data-type> + <name>relevant_for_building</name> + <data-type>BIT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>description</name> - <data-type>TEXT</data-type> + <name>relevant_for_binary_packages</name> + <data-type>BIT</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="{36980651-4f03-4748-aee8-1f9211aaafde}"> + <item id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}" type="database-table"> <position> - <x>821</x> - <y>-49</y> + <x>-8</x> + <y>572</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> @@ -1202,18 +1106,18 @@ </column-list> </table> </item> - <item type="database-table" id="{75e4ebd8-5915-4aff-8316-0c542d3953da}"> + <item id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}" type="database-table"> <position> - <x>240</x> - <y>-66</y> + <x>829</x> + <y>168</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> @@ -1223,46 +1127,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 id="{d823ab09-1c04-44ee-ad4b-6802208967ff}" type="database-table"> <position> - <x>106</x> - <y>-51</y> + <x>793</x> + <y>497</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 id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}" type="database-table"> <position> - <x>68</x> - <y>42</y> + <x>-55</x> + <y>-72</y> </position> <table> - <name>allowed_email_actions</name> + <name>email_log</name> <color>#ffffff</color> <column-list> <column> @@ -1272,51 +1188,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 id="{5f12db03-a8bb-4467-bab6-a57e545b9081}" type="database-table"> <position> - <x>-54</x> - <y>70</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 id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}" type="database-table"> <position> - <x>229</x> - <y>20</y> + <x>525</x> + <y>215</y> </position> <table> - <name>ssh_keys</name> + <name>binary_packages_in_repositories</name> <color>#ffffff</color> <column-list> <column> @@ -1326,69 +1284,87 @@ <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-table" id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"> + <item id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}" type="database-table"> <position> - <x>656</x> - <y>380</y> + <x>345</x> + <y>-71</y> </position> <table> - <name>architecture_compatibilities</name> + <name>dependencies</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>built_for</name> - <data-type>SMALLINT</data-type> + <name>dependent</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>runs_on</name> + <name>depending_on</name> + <data-type>BIGINT</data-type> + <required>True</required> + <primary-key>False</primary-key> + </column> + <column> + <name>dependency_type</name> <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>fully_compatible</name> - <data-type>BIT</data-type> + <name>version</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>build_slave_compatible</name> - <data-type>BIT(n)</data-type> + <name>version_relation</name> + <data-type>VARCHAR(2)</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-table" id="{bb59ebca-0255-40dd-91b4-68bd2e110447}"> + <item id="{a67b38a9-c701-412c-8292-5ef58536da85}" type="database-table"> <position> - <x>901</x> - <y>641</y> + <x>483</x> + <y>57</y> </position> <table> - <name>mirror_statuses</name> + <name>versions</name> <color>#ffffff</color> <column-list> <column> @@ -1398,125 +1374,155 @@ <primary-key>True</primary-key> </column> <column> - <name>protocol</name> - <data-type>VARCHAR(8)</data-type> + <name>order</name> + <data-type>BIGINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>url</name> - <data-type>VARCHAR(128)</data-type> + <name>epoch</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>country</name> - <data-type>VARCHAR(64)</data-type> + <name>version</name> + <data-type>VARCHAR(32)</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}" type="database-table"> + <position> + <x>-23</x> + <y>750</y> + </position> + <table> + <name>toolchain_order</name> + <color>#ffffff</color> + <column-list> <column> - <name>country_code</name> - <data-type>VARCHAR(4)</data-type> + <name>number</name> + <data-type>SMALLINT</data-type> + <required>True</required> + <primary-key>True</primary-key> + </column> + <column> + <name>pkgbase</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> + </column-list> + </table> + </item> + <item id="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}" type="database-table"> + <position> + <x>632</x> + <y>498</y> + </position> + <table> + <name>upstream_packages</name> + <color>#ffffff</color> + <column-list> <column> - <name>last_sync</name> + <name>id</name> <data-type>BIGINT</data-type> <required>True</required> - <primary-key>False</primary-key> + <primary-key>True</primary-key> </column> <column> - <name>start</name> - <data-type>FLOAT</data-type> + <name>pkgname</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>stop</name> - <data-type>FLOAT</data-type> + <name>epoch</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>isos</name> - <data-type>BIT</data-type> + <name>pkgver</name> + <data-type>VARCHAR(64)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>ipv4</name> - <data-type>BIT</data-type> + <name>pkgrel</name> + <data-type>MEDIUMINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>ipv6</name> - <data-type>BIT</data-type> + <name>architecture</name> + <data-type>VARCHAR(6)</data-type> <required>True</required> <primary-key>False</primary-key> </column> <column> - <name>active</name> - <data-type>BIT</data-type> + <name>repository</name> + <data-type>SMALLINT</data-type> <required>True</required> <primary-key>False</primary-key> </column> </column-list> </table> </item> - <item type="database-relationship" id="{279b4b3b-c166-4343-bce6-ff3dfb6669a0}"> + <item id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>483.75</x> - <y>455</y> + <x>656</x> + <y>441.875</y> </position> - <angle>90</angle> - <hub owner="{9085c36f-5884-41c8-9ca8-9d53973e657d}"/> + <angle>180</angle> + <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/> </connector> <connector> <position> - <x>429.273</x> - <y>428.813</y> + <x>476.547</x> + <y>416.109</y> </position> - <angle>270</angle> + <angle>0</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>14</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{747ab82c-bbbf-498d-a6bd-13633c73fd6f}"> + <item id="{30a694b2-681f-44ae-90bb-911220d65737}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>699.898</x> - <y>618.813</y> + <x>656</x> + <y>410.938</y> </position> - <angle>270</angle> - <hub owner="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}"/> + <angle>180</angle> + <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/> </connector> <connector> <position> - <x>778.818</x> - <y>684</y> + <x>476.547</x> + <y>403.406</y> </position> - <angle>90</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <angle>0</angle> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> @@ -1527,62 +1533,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>6</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{64756b6f-e7d3-4995-8b5d-21d07292741f}"> + <item id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>85.5469</x> - <y>775.406</y> - </position> - <angle>0</angle> - <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/> - </connector> - <connector> - <position> - <x>173</x> - <y>776.406</y> + <x>803</x> + <y>322.875</y> </position> <angle>180</angle> - <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> - </connector> - </connector-list> - </line> - <relationship> - <cardinality>OneToOne</cardinality> - <modality> - <child>Optional</child> - <parent>Optional</parent> - </modality> - <columns> - <child>1</child> - <parent>1</parent> - </columns> - </relationship> - </item> - <item type="database-relationship" id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}"> - <line> - <connector-list> - <connector> - <position> - <x>446.115</x> - <y>35.8125</y> - </position> - <angle>270</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> <connector> <position> - <x>524.594</x> - <y>57</y> + <x>476.547</x> + <y>390.703</y> </position> - <angle>90</angle> - <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/> + <angle>0</angle> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> @@ -1598,24 +1571,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}"> + <item id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>604</x> - <y>118.938</y> + <x>282.328</x> + <y>20</y> </position> - <angle>180</angle> - <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> + <angle>90</angle> + <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> </connector> <connector> <position> - <x>566.188</x> - <y>96.4063</y> + <x>275.289</x> + <y>-15.1875</y> </position> - <angle>0</angle> - <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/> + <angle>270</angle> + <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> </connector> </connector-list> </line> @@ -1626,29 +1599,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>3</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}"> + <item id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>496.672</x> - <y>-35.3958</y> + <x>188.727</x> + <y>148</y> </position> - <angle>0</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <angle>90</angle> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> <connector> <position> - <x>580</x> - <y>-31.5938</y> + <x>282.328</x> + <y>84.8125</y> </position> - <angle>180</angle> - <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/> + <angle>270</angle> + <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> </connector> </connector-list> </line> @@ -1659,29 +1632,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>3</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{ab992baa-6a2c-441b-a290-da42a791eb95}"> + <item id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>496.672</x> - <y>0.208333</y> + <x>-9.85156</x> + <y>48.8125</y> </position> - <angle>0</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <angle>270</angle> + <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> </connector> <connector> <position> - <x>653</x> - <y>46.4063</y> + <x>-5.27344</x> + <y>70</y> </position> - <angle>180</angle> - <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> + <angle>90</angle> + <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> </connector> </connector-list> </line> @@ -1692,37 +1665,37 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>3</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}"> + <item id="{af592aac-17cd-415f-99e8-9cf164311215}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>734.844</x> - <y>261.406</y> + <x>68</x> + <y>74.4063</y> </position> - <angle>0</angle> - <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> + <angle>180</angle> + <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> </connector> <connector> <position> - <x>803</x> - <y>291.938</y> + <x>43.4531</x> + <y>95.4063</y> </position> - <angle>180</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <angle>0</angle> + <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> </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> @@ -1730,24 +1703,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}"> + <item id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>395.557</x> - <y>35.8125</y> + <x>142.789</x> + <y>42</y> </position> - <angle>270</angle> - <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + <angle>90</angle> + <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> </connector> <connector> <position> - <x>381.93</x> - <y>99</y> + <x>159.328</x> + <y>13.8125</y> </position> - <angle>90</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <angle>270</angle> + <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> </connector> </connector-list> </line> @@ -1763,24 +1736,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}"> + <item id="{803ce991-1984-4cab-9bb8-48acabb347af}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>525</x> - <y>261.406</y> + <x>35.2969</x> + <y>-11.5938</y> </position> - <angle>180</angle> - <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> + <angle>0</angle> + <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> </connector> <connector> <position> - <x>464.859</x> - <y>226.208</y> + <x>106</x> + <y>-18.5938</y> </position> - <angle>0</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <angle>180</angle> + <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> </connector> </connector-list> </line> @@ -1791,29 +1764,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>5</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}"> + <item id="{abba2005-f23b-445f-aea6-ff9365bc1569}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>59.5313</x> - <y>180.406</y> + <x>212.656</x> + <y>-18.5938</y> </position> <angle>0</angle> - <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/> + <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> </connector> <connector> <position> - <x>118</x> - <y>222.406</y> + <x>240</x> + <y>-40.5938</y> </position> <angle>180</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> </connector> </connector-list> </line> @@ -1829,24 +1802,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}"> + <item id="{172204a1-76e9-45fc-826f-b3d174112734}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>911.133</x> - <y>575.813</y> + <x>948.234</x> + <y>-32.0625</y> </position> - <angle>270</angle> - <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> + <angle>0</angle> + <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> </connector> <connector> <position> - <x>828.635</x> - <y>684</y> + <x>971</x> + <y>-38.0625</y> </position> - <angle>90</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <angle>180</angle> + <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> </connector> </connector-list> </line> @@ -1857,29 +1830,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>3</child> + <child>0</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}"> + <item id="{bb03129e-aba8-4449-88c1-6c352745aeda}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>871.755</x> - <y>497</y> + <x>948.234</x> + <y>-15.125</y> </position> - <angle>90</angle> - <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> + <angle>0</angle> + <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> </connector> <connector> <position> - <x>859.469</x> - <y>353.813</y> + <x>971</x> + <y>-7.125</y> </position> - <angle>270</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <angle>180</angle> + <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> </connector> </connector-list> </line> @@ -1895,24 +1868,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}"> + <item id="{fa899065-104a-466d-bc8c-16589a774a45}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>950.51</x> - <y>497</y> + <x>941.313</x> + <y>121.813</y> </position> - <angle>90</angle> - <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> + <angle>270</angle> + <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> </connector> <connector> <position> - <x>915.938</x> - <y>353.813</y> + <x>934.271</x> + <y>168</y> </position> - <angle>270</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <angle>90</angle> + <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> </connector> </connector-list> </line> @@ -1928,24 +1901,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}"> + <item id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>409.573</x> - <y>289.813</y> + <x>878.656</x> + <y>121.813</y> </position> <angle>270</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> </connector> <connector> <position> - <x>429.273</x> - <y>378</y> + <x>881.635</x> + <y>168</y> </position> <angle>90</angle> - <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> + <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> </connector> </connector-list> </line> @@ -1956,29 +1929,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>9</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}"> + <item id="{65ace480-001e-4e4e-912d-2a975ff995c8}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>887.703</x> - <y>261</y> + <x>31.5729</x> + <y>365</y> </position> <angle>90</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> </connector> <connector> <position> - <x>907.953</x> - <y>232.813</y> + <x>-5.0625</x> + <y>318.813</y> </position> <angle>270</angle> - <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> + <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/> </connector> </connector-list> </line> @@ -1989,29 +1962,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>4</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}"> + <item id="{35556854-c6c3-45e8-9e10-bd5150680fd2}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>697.203</x> - <y>88</y> + <x>132.719</x> + <y>425.406</y> </position> - <angle>90</angle> - <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> + <angle>0</angle> + <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> </connector> <connector> <position> - <x>703.016</x> - <y>71.8125</y> + <x>164</x> + <y>457.604</y> </position> - <angle>270</angle> - <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> + <angle>180</angle> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -2027,24 +2000,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}"> + <item id="{307a930b-cbe8-4000-b89d-b6cc99479b19}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>604</x> - <y>149.875</y> + <x>82.1458</x> + <y>365</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>464.859</x> - <y>162.604</y> + <x>165.151</x> + <y>310.813</y> </position> - <angle>0</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <angle>270</angle> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> </connector-list> </line> @@ -2060,24 +2033,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}"> + <item id="{40654aec-f5e1-4d82-a528-102a76a971d3}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>409.266</x> - <y>776.406</y> + <x>73.1953</x> + <y>572</y> </position> - <angle>0</angle> - <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> + <angle>90</angle> + <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/> </connector> <connector> <position> - <x>729</x> - <y>716.406</y> + <x>164</x> + <y>507.208</y> </position> <angle>180</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -2088,29 +2061,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 id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>803.727</x> - <y>748.813</y> + <x>212.302</x> + <y>310.813</y> </position> <angle>270</angle> - <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> <connector> <position> - <x>705.609</x> - <y>782.406</y> + <x>211.927</x> + <y>408</y> </position> - <angle>0</angle> - <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/> + <angle>90</angle> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -2121,29 +2094,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>3</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}"> + <item id="{883853fb-bda9-450c-bde3-77422973b925}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>235.891</x> - <y>556.813</y> + <x>354.286</x> + <y>289.813</y> </position> <angle>270</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> <connector> <position> - <x>291.133</x> - <y>709</y> + <x>259.854</x> + <y>408</y> </position> <angle>90</angle> - <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> </connector-list> </line> @@ -2159,7 +2132,7 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}"> + <item id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}" type="database-relationship"> <line> <connector-list> <connector> @@ -2192,24 +2165,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{883853fb-bda9-450c-bde3-77422973b925}"> + <item id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>354.286</x> - <y>289.813</y> + <x>235.891</x> + <y>556.813</y> </position> <angle>270</angle> - <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> + <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> </connector> <connector> <position> - <x>259.854</x> - <y>408</y> + <x>291.133</x> + <y>709</y> </position> <angle>90</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> </connector> </connector-list> </line> @@ -2225,24 +2198,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}"> + <item id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>212.302</x> - <y>296.813</y> + <x>803.727</x> + <y>748.813</y> </position> <angle>270</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> <connector> <position> - <x>211.927</x> - <y>408</y> + <x>705.609</x> + <y>782.406</y> </position> - <angle>90</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <angle>0</angle> + <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/> </connector> </connector-list> </line> @@ -2253,29 +2226,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 id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>73.1953</x> - <y>572</y> + <x>409.266</x> + <y>776.406</y> </position> - <angle>90</angle> - <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/> + <angle>0</angle> + <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> </connector> <connector> <position> - <x>164</x> - <y>507.208</y> + <x>729</x> + <y>716.406</y> </position> <angle>180</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> </connector-list> </line> @@ -2286,29 +2259,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>4</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}"> + <item id="{89cacf0f-5195-48db-aace-02a13aa29eee}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>82.1458</x> - <y>365</y> + <x>604</x> + <y>149.875</y> </position> - <angle>90</angle> - <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> + <angle>180</angle> + <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> </connector> <connector> <position> - <x>165.151</x> - <y>296.813</y> + <x>464.859</x> + <y>162.604</y> </position> - <angle>270</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <angle>0</angle> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> </connector-list> </line> @@ -2324,24 +2297,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{35556854-c6c3-45e8-9e10-bd5150680fd2}"> + <item id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>132.719</x> - <y>425.406</y> + <x>697.203</x> + <y>88</y> </position> - <angle>0</angle> - <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> + <angle>90</angle> + <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> </connector> <connector> <position> - <x>164</x> - <y>457.604</y> + <x>703.016</x> + <y>71.8125</y> </position> - <angle>180</angle> - <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/> + <angle>270</angle> + <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> </connector> </connector-list> </line> @@ -2357,24 +2330,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}"> + <item id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>31.5729</x> - <y>365</y> + <x>887.703</x> + <y>261</y> </position> <angle>90</angle> - <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> <connector> <position> - <x>-5.0625</x> - <y>318.813</y> + <x>907.953</x> + <y>232.813</y> </position> <angle>270</angle> - <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/> + <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> </connector> </connector-list> </line> @@ -2385,29 +2358,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>4</child> + <child>2</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}"> + <item id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>941.313</x> - <y>121.813</y> + <x>409.573</x> + <y>289.813</y> </position> <angle>270</angle> - <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> <connector> <position> - <x>934.271</x> - <y>168</y> + <x>429.273</x> + <y>378</y> </position> <angle>90</angle> - <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> + <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </connector> </connector-list> </line> @@ -2418,29 +2391,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>9</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}"> + <item id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>878.656</x> - <y>121.813</y> + <x>871.755</x> + <y>497</y> </position> - <angle>270</angle> - <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/> + <angle>90</angle> + <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> </connector> <connector> <position> - <x>881.635</x> - <y>168</y> + <x>859.469</x> + <y>353.813</y> </position> - <angle>90</angle> - <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/> + <angle>270</angle> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> </connector-list> </line> @@ -2456,24 +2429,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}"> + <item id="{6094d4c4-439f-4e6c-94e1-736ae145362a}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>948.234</x> - <y>-32.0625</y> + <x>950.51</x> + <y>497</y> </position> - <angle>0</angle> - <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> + <angle>90</angle> + <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> </connector> <connector> <position> - <x>971</x> - <y>-38.0625</y> + <x>915.938</x> + <y>353.813</y> </position> - <angle>180</angle> - <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> + <angle>270</angle> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> </connector-list> </line> @@ -2489,24 +2462,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{172204a1-76e9-45fc-826f-b3d174112734}"> + <item id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>948.234</x> - <y>-15.125</y> + <x>911.133</x> + <y>575.813</y> </position> - <angle>0</angle> - <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/> + <angle>270</angle> + <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/> </connector> <connector> <position> - <x>971</x> - <y>-7.125</y> + <x>828.635</x> + <y>684</y> </position> - <angle>180</angle> - <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/> + <angle>90</angle> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> </connector-list> </line> @@ -2517,29 +2490,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>0</child> + <child>3</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}"> + <item id="{9a650bd7-521d-499f-ac79-a0fd9226a656}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>212.656</x> - <y>-18.5938</y> + <x>59.5313</x> + <y>180.406</y> </position> <angle>0</angle> - <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> + <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/> </connector> <connector> <position> - <x>240</x> - <y>-40.5938</y> + <x>118</x> + <y>229.406</y> </position> <angle>180</angle> - <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> + <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> </connector> </connector-list> </line> @@ -2555,24 +2528,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}"> + <item id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>35.2969</x> - <y>-11.5938</y> + <x>525</x> + <y>261.406</y> </position> - <angle>0</angle> - <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> + <angle>180</angle> + <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> </connector> <connector> <position> - <x>106</x> - <y>-18.5938</y> + <x>464.859</x> + <y>226.208</y> </position> - <angle>180</angle> - <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> + <angle>0</angle> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> </connector-list> </line> @@ -2583,29 +2556,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>5</child> + <child>1</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}"> + <item id="{f26515ec-f37f-4eb3-a07f-6d5077208806}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>142.789</x> - <y>42</y> + <x>395.557</x> + <y>35.8125</y> </position> - <angle>90</angle> - <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> + <angle>270</angle> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> </connector> <connector> <position> - <x>159.328</x> - <y>13.8125</y> + <x>381.93</x> + <y>99</y> </position> - <angle>270</angle> - <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/> + <angle>90</angle> + <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/> </connector> </connector-list> </line> @@ -2621,24 +2594,57 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{af592aac-17cd-415f-99e8-9cf164311215}"> + <item id="{0213a360-5a3b-484f-82c7-320003506c8a}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>68</x> - <y>74.4063</y> + <x>734.844</x> + <y>261.406</y> + </position> + <angle>0</angle> + <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/> + </connector> + <connector> + <position> + <x>803</x> + <y>291.938</y> </position> <angle>180</angle> - <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/> + <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> </connector> + </connector-list> + </line> + <relationship> + <cardinality>OneToMany</cardinality> + <modality> + <child>Optional</child> + <parent>Optional</parent> + </modality> + <columns> + <child>2</child> + <parent>0</parent> + </columns> + </relationship> + </item> + <item id="{ab992baa-6a2c-441b-a290-da42a791eb95}" type="database-relationship"> + <line> + <connector-list> <connector> <position> - <x>43.4531</x> - <y>95.4063</y> + <x>496.672</x> + <y>0.208333</y> </position> <angle>0</angle> - <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> + </connector> + <connector> + <position> + <x>653</x> + <y>46.4063</y> + </position> + <angle>180</angle> + <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/> </connector> </connector-list> </line> @@ -2654,24 +2660,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}"> + <item id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>-9.85156</x> - <y>48.8125</y> + <x>496.672</x> + <y>-35.3958</y> </position> - <angle>270</angle> - <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/> + <angle>0</angle> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> </connector> <connector> <position> - <x>-5.27344</x> - <y>70</y> + <x>580</x> + <y>-31.5938</y> </position> - <angle>90</angle> - <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/> + <angle>180</angle> + <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/> </connector> </connector-list> </line> @@ -2687,24 +2693,24 @@ </columns> </relationship> </item> - <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}"> + <item id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>188.727</x> - <y>148</y> + <x>604</x> + <y>118.938</y> </position> - <angle>90</angle> - <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/> + <angle>180</angle> + <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/> </connector> <connector> <position> - <x>282.328</x> - <y>84.8125</y> + <x>566.188</x> + <y>96.4063</y> </position> - <angle>270</angle> - <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> + <angle>0</angle> + <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/> </connector> </connector-list> </line> @@ -2715,29 +2721,29 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>3</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}"> + <item id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>282.328</x> - <y>20</y> + <x>446.115</x> + <y>35.8125</y> </position> - <angle>90</angle> - <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/> + <angle>270</angle> + <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/> </connector> <connector> <position> - <x>275.289</x> - <y>-15.1875</y> + <x>524.594</x> + <y>57</y> </position> - <angle>270</angle> - <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/> + <angle>90</angle> + <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/> </connector> </connector-list> </line> @@ -2748,62 +2754,62 @@ <parent>Mandatory</parent> </modality> <columns> - <child>1</child> + <child>4</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}"> + <item id="{64756b6f-e7d3-4995-8b5d-21d07292741f}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>803</x> - <y>322.875</y> + <x>85.5469</x> + <y>775.406</y> </position> - <angle>180</angle> - <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/> + <angle>0</angle> + <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/> </connector> <connector> <position> - <x>476.547</x> - <y>390.703</y> + <x>173</x> + <y>776.406</y> </position> - <angle>0</angle> - <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> + <angle>180</angle> + <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/> </connector> </connector-list> </line> <relationship> <cardinality>OneToOne</cardinality> <modality> - <child>Mandatory</child> - <parent>Mandatory</parent> + <child>Optional</child> + <parent>Optional</parent> </modality> <columns> - <child>4</child> - <parent>0</parent> + <child>1</child> + <parent>1</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{30a694b2-681f-44ae-90bb-911220d65737}"> + <item id="{747ab82c-bbbf-498d-a6bd-13633c73fd6f}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>656</x> - <y>441.875</y> + <x>699.898</x> + <y>618.813</y> </position> - <angle>180</angle> - <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/> + <angle>270</angle> + <hub owner="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}"/> </connector> <connector> <position> - <x>476.547</x> - <y>416.109</y> + <x>778.818</x> + <y>684</y> </position> - <angle>0</angle> - <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> + <angle>90</angle> + <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/> </connector> </connector-list> </line> @@ -2814,40 +2820,40 @@ <parent>Mandatory</parent> </modality> <columns> - <child>2</child> + <child>6</child> <parent>0</parent> </columns> </relationship> </item> - <item type="database-relationship" id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}"> + <item id="{279b4b3b-c166-4343-bce6-ff3dfb6669a0}" type="database-relationship"> <line> <connector-list> <connector> <position> - <x>656</x> - <y>410.938</y> + <x>483.75</x> + <y>455</y> </position> - <angle>180</angle> - <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/> + <angle>90</angle> + <hub owner="{9085c36f-5884-41c8-9ca8-9d53973e657d}"/> </connector> <connector> <position> - <x>476.547</x> - <y>403.406</y> + <x>429.273</x> + <y>428.813</y> </position> - <angle>0</angle> + <angle>270</angle> <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/> </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>1</child> + <child>14</child> <parent>0</parent> </columns> </relationship> diff --git a/misc/database-layout.dump b/misc/database-layout.dump index ff8debe..2ae42c4 100644 --- a/misc/database-layout.dump +++ b/misc/database-layout.dump @@ -603,6 +603,7 @@ build_slaves CREATE TABLE `build_slaves` ( `ssh_key` bigint(20) NOT NULL, `trials` mediumint(9) DEFAULT NULL, `is_sane` bit(1) NOT NULL, + `access_allowed` bit(1) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`), KEY `currently_building` (`currently_building`), |