From 9ec94e507ffde2b21b95b1107d6812f83bebc104 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Thu, 17 Oct 2019 09:54:21 +0200
Subject: `compressions` and `binary_packages`.`compression` new

---
 misc/database-layout.dmf  | 2033 +++++++++++++++++++++++----------------------
 misc/database-layout.dump |   20 +-
 2 files changed, 1067 insertions(+), 986 deletions(-)

(limited to 'misc')

diff --git a/misc/database-layout.dmf b/misc/database-layout.dmf
index e1f59e2..b03dd47 100644
--- a/misc/database-layout.dmf
+++ b/misc/database-layout.dmf
@@ -2,13 +2,37 @@
 <diagram xmlns="http://oxygene.sk/ns/diagram/1/">
   <notation>Relational</notation>
   <item-list>
-    <item type="database-table" id="{91a05cd7-dc02-474b-bd10-aab0f53ce9d7}">
+    <item id="{44dd2d06-f012-46f7-a1a9-d38dd21b4287}" type="database-table">
       <position>
-        <x>977</x>
-        <y>378</y>
+        <x>187</x>
+        <y>294</y>
       </position>
       <table>
-        <name>command_log</name>
+        <name>compressions</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>suffix</name>
+            <data-type>VARCHAR(8)</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{bb59ebca-0255-40dd-91b4-68bd2e110447}" type="database-table">
+      <position>
+        <x>901</x>
+        <y>641</y>
+      </position>
+      <table>
+        <name>mirror_statuses</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -18,123 +42,123 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>protocol</name>
+            <data-type>VARCHAR(8)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>command</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>parameters</name>
-            <data-type>TEXT</data-type>
+            <name>country</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>shell</name>
-            <data-type>BIT</data-type>
+            <name>country_code</name>
+            <data-type>VARCHAR(4)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}">
-      <position>
-        <x>632</x>
-        <y>498</y>
-      </position>
-      <table>
-        <name>upstream_packages</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
+            <name>last_sync</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pkgname</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>start</name>
+            <data-type>FLOAT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>epoch</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>stop</name>
+            <data-type>FLOAT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pkgver</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>isos</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pkgrel</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>ipv4</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>architecture</name>
-            <data-type>VARCHAR(6)</data-type>
+            <name>ipv6</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>repository</name>
-            <data-type>SMALLINT</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="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}">
+    <item id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}" type="database-table">
       <position>
-        <x>-31</x>
-        <y>605</y>
+        <x>656</x>
+        <y>380</y>
       </position>
       <table>
-        <name>toolchain_order</name>
+        <name>architecture_compatibilities</name>
         <color>#ffffff</color>
         <column-list>
           <column>
-            <name>number</name>
-            <data-type>SMALLINT</data-type>
+            <name>id</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>pkgbase</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>built_for</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>requires_all_dependencies_built</name>
+            <name>runs_on</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>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <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="{a67b38a9-c701-412c-8292-5ef58536da85}">
+    <item id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}" type="database-table">
       <position>
-        <x>483</x>
-        <y>57</y>
+        <x>229</x>
+        <y>20</y>
       </position>
       <table>
-        <name>versions</name>
+        <name>ssh_keys</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -144,19 +168,37 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>order</name>
-            <data-type>BIGINT</data-type>
+            <name>owner</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>epoch</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>fingerprint</name>
+            <data-type>TEXT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{6180fcbf-5069-4d86-8919-fd39394f1813}" type="database-table">
+      <position>
+        <x>-54</x>
+        <y>70</y>
+      </position>
+      <table>
+        <name>email_actions</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>version</name>
+            <name>id</name>
+            <data-type>MEDIUMINT</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>
@@ -164,13 +206,13 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}">
+    <item id="{b5671c08-e24a-4293-b983-3c86b1a6d622}" type="database-table">
       <position>
-        <x>345</x>
-        <y>-71</y>
+        <x>56</x>
+        <y>26</y>
       </position>
       <table>
-        <name>dependencies</name>
+        <name>allowed_email_actions</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -180,87 +222,111 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>dependent</name>
+            <name>gpg_key</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>action</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{f31249ea-ab19-45a4-9427-1854379ad8e7}" type="database-table">
+      <position>
+        <x>92</x>
+        <y>-69</y>
+      </position>
+      <table>
+        <name>gpg_keys</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>dependency_type</name>
-            <data-type>SMALLINT</data-type>
+            <name>fingerprint</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version</name>
-            <data-type>BIGINT</data-type>
+            <name>owner</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version_relation</name>
-            <data-type>VARCHAR(2)</data-type>
+            <name>public_key</name>
+            <data-type>TEXT</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="{75e4ebd8-5915-4aff-8316-0c542d3953da}" type="database-table">
       <position>
-        <x>525</x>
-        <y>215</y>
+        <x>240</x>
+        <y>-66</y>
       </position>
       <table>
-        <name>binary_packages_in_repositories</name>
+        <name>persons</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>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>repository</name>
-            <data-type>MEDIUMINT</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 id="{36980651-4f03-4748-aee8-1f9211aaafde}" type="database-table">
+      <position>
+        <x>821</x>
+        <y>-49</y>
+      </position>
+      <table>
+        <name>todo_links</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>is_to_be_deleted</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>last_moved</name>
-            <data-type>TIMESTAMP</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="{5f12db03-a8bb-4467-bab6-a57e545b9081}">
+    <item id="{dc01c567-d657-4db7-8a55-d2763ed00cee}" type="database-table">
       <position>
-        <x>-52</x>
-        <y>134</y>
+        <x>971</x>
+        <y>-69</y>
       </position>
       <table>
-        <name>ssh_log</name>
+        <name>todos</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -270,51 +336,39 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>file</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>build_slave</name>
+            <name>line</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>description</name>
             <data-type>TEXT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>duration</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>exit_code</name>
-            <data-type>MEDIUMINT</data-type>
+            <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="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}">
+    <item id="{9085c36f-5884-41c8-9ca8-9d53973e657d}" type="database-table">
       <position>
-        <x>-55</x>
-        <y>-72</y>
+        <x>357</x>
+        <y>455</y>
       </position>
       <table>
-        <name>email_log</name>
+        <name>statitstics</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -330,363 +384,279 @@
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>success</name>
-            <data-type>BIT</data-type>
+            <name>stable_packages_count</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>action</name>
+            <name>pending_tasks_count</name>
             <data-type>MEDIUMINT</data-type>
-            <required>False</required>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>count</name>
+            <name>pending_packages_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}">
-      <position>
-        <x>793</x>
-        <y>497</y>
-      </position>
-      <table>
-        <name>repository_moves</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
+            <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>from_repository</name>
+            <name>testing_packages_count</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>to_repository</name>
+            <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-list>
-      </table>
-    </item>
-    <item type="database-table" id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}">
-      <position>
-        <x>829</x>
-        <y>168</y>
-      </position>
-      <table>
-        <name>repository_stabilities</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>SMALLINT</data-type>
+            <name>dependency_loops_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(32)</data-type>
+            <name>dependency_looped_tasks_count</name>
+            <data-type>MEDIUMINT</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>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="{04b6fdc5-85ae-4416-8db5-034ad05be93a}">
-      <position>
-        <x>-22</x>
-        <y>527</y>
-      </position>
-      <table>
-        <name>build_dependency_loops</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>BIGINT</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>loop</name>
+            <name>next_tasks_count</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>build_assignment</name>
-            <data-type>BIGINT</data-type>
+            <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="{be821d83-a9b4-4c0c-8e1b-433730200714}">
+    <item id="{92f54126-a433-458e-80b7-67235e560334}" type="database-table">
       <position>
-        <x>580</x>
-        <y>-71</y>
+        <x>816</x>
+        <y>57</y>
       </position>
       <table>
-        <name>dependency_types</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(32)</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>relevant_for_building</name>
-            <data-type>BIT</data-type>
+            <name>more_stable</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>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="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}">
+    <item id="{7b159780-7f39-45a7-9557-046874a57e43}" type="database-table">
       <position>
-        <x>653</x>
-        <y>21</y>
+        <x>-43</x>
+        <y>267</y>
       </position>
       <table>
-        <name>install_targets</name>
+        <name>fail_reasons</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>name</name>
-            <data-type>VARCHAR(64)</data-type>
+            <data-type>VARCHAR(32)</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>identifier</name>
+            <data-type>VARCHAR(64)</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>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="{7c210122-c51d-4724-b7cc-22f143bc47ac}">
+    <item id="{a774fcb7-1193-4b57-947c-135212695915}" type="database-table">
       <position>
-        <x>103</x>
-        <y>694</y>
+        <x>-44</x>
+        <y>372</y>
       </position>
       <table>
-        <name>package_sources</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>pkgbase</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>git_revision</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>build_assignment</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>mod_git_revision</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>date</name>
+            <data-type>TIMESTAMP</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>upstream_package_repository</name>
+            <name>reason</name>
             <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>uses_upstream</name>
-            <data-type>BIT</data-type>
+            <name>log_file</name>
+            <data-type>VARCHAR(512)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>uses_modification</name>
+            <name>log_file_exists</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <name>commit_time</name>
-            <data-type>TIMESTAMP</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>upstream_flag_date</name>
-            <data-type>TIMESTAMP</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
-          </column>
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}">
+    <item id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}" type="database-table">
       <position>
-        <x>729</x>
-        <y>684</y>
+        <x>153</x>
+        <y>447</y>
       </position>
       <table>
-        <name>upstream_repositories</name>
+        <name>build_assignments</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(64)</data-type>
+            <name>package_source</name>
+            <data-type>BIGINT</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>
           </column>
-        </column-list>
-      </table>
-    </item>
-    <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}">
-      <position>
-        <x>598</x>
-        <y>736</y>
-      </position>
-      <table>
-        <name>git_repositories</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>SMALLINT</data-type>
-            <required>True</required>
-            <primary-key>True</primary-key>
+            <name>is_blocked</name>
+            <data-type>VARCHAR(128)</data-type>
+            <required>False</required>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(64)</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>url</name>
-            <data-type>VARCHAR(128)</data-type>
+            <name>is_broken</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>directory</name>
-            <data-type>VARCHAR(128)</data-type>
+            <name>priority</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>head</name>
-            <data-type>VARCHAR(40)</data-type>
-            <required>True</required>
+            <name>return_date</name>
+            <data-type>TIMESTAMP</data-type>
+            <required>False</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <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="{844766fc-c5af-4f61-b51b-d3f9393c60ca}">
+    <item id="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}" type="database-table">
       <position>
-        <x>803</x>
-        <y>261</y>
+        <x>74</x>
+        <y>113</y>
       </position>
       <table>
-        <name>repositories</name>
+        <name>build_slaves</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -697,74 +667,62 @@
           </column>
           <column>
             <name>name</name>
-            <data-type>VARCHAR(64)</data-type>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>stability</name>
-            <data-type>SMALLINT</data-type>
+            <name>ssh_key</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>
-            <required>True</required>
+            <name>currently_building</name>
+            <data-type>BIGINT</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>architecture</name>
-            <data-type>SMALLINT</data-type>
+            <name>last_connection</name>
+            <data-type>TIME</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>604</x>
-        <y>88</y>
-      </position>
-      <table>
-        <name>install_target_providers</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
+            <name>logged_lines</name>
             <data-type>BIGINT</data-type>
-            <required>True</required>
-            <primary-key>True</primary-key>
+            <required>False</required>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>package</name>
-            <data-type>BIGINT</data-type>
-            <required>True</required>
+            <name>last_action</name>
+            <data-type>VARCHAR(32)</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>install_target</name>
-            <data-type>BIGINT</data-type>
-            <required>True</required>
+            <name>trials</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>version</name>
-            <data-type>BIGINT</data-type>
+            <name>is_sane</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>install_target_is_group</name>
-            <data-type>BIT</data-type>
+            <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="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}">
+    <item id="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}" type="database-table">
       <position>
         <x>299</x>
         <y>99</y>
@@ -845,208 +803,292 @@
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>compression</name>
+            <data-type>SMALLINT</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="{f8caa2d5-11ba-485c-b273-8183713896bf}" type="database-table">
       <position>
-        <x>118</x>
-        <y>148</y>
+        <x>604</x>
+        <y>88</y>
       </position>
       <table>
-        <name>build_slaves</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>name</name>
-            <data-type>VARCHAR(32)</data-type>
+            <name>package</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>ssh_key</name>
+            <name>install_target</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>currently_building</name>
+            <name>version</name>
             <data-type>BIGINT</data-type>
-            <required>False</required>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>last_connection</name>
-            <data-type>TIME</data-type>
+            <name>install_target_is_group</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}" type="database-table">
+      <position>
+        <x>803</x>
+        <y>261</y>
+      </position>
+      <table>
+        <name>repositories</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>logged_lines</name>
-            <data-type>BIGINT</data-type>
-            <required>False</required>
-            <primary-key>False</primary-key>
+            <name>id</name>
+            <data-type>MEDIUMINT</data-type>
+            <required>True</required>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>last_action</name>
-            <data-type>VARCHAR(32)</data-type>
-            <required>False</required>
+            <name>name</name>
+            <data-type>VARCHAR(64)</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>trials</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>False</required>
+            <name>stability</name>
+            <data-type>SMALLINT</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_sane</name>
+            <name>is_on_master_mirror</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>access_allowed</name>
-            <data-type>BIT(n)</data-type>
+            <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="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}">
+    <item id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}" type="database-table">
       <position>
-        <x>164</x>
-        <y>408</y>
+        <x>598</x>
+        <y>736</y>
       </position>
       <table>
-        <name>build_assignments</name>
+        <name>git_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>package_source</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>name</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_blocked</name>
+            <name>url</name>
             <data-type>VARCHAR(128)</data-type>
-            <required>False</required>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_black_listed</name>
+            <name>directory</name>
             <data-type>VARCHAR(128)</data-type>
-            <required>False</required>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>is_broken</name>
-            <data-type>BIT</data-type>
+            <name>head</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}" type="database-table">
+      <position>
+        <x>729</x>
+        <y>684</y>
+      </position>
+      <table>
+        <name>upstream_repositories</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>priority</name>
+            <name>id</name>
             <data-type>SMALLINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>return_date</name>
-            <data-type>TIMESTAMP</data-type>
-            <required>False</required>
+            <name>name</name>
+            <data-type>VARCHAR(64)</data-type>
+            <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>currently_blocking</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>False</required>
+            <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="{a774fcb7-1193-4b57-947c-135212695915}">
+    <item id="{7c210122-c51d-4724-b7cc-22f143bc47ac}" type="database-table">
       <position>
-        <x>-22</x>
-        <y>374</y>
+        <x>103</x>
+        <y>694</y>
       </position>
       <table>
-        <name>failed_builds</name>
+        <name>package_sources</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>pkgbase</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>build_assignment</name>
-            <data-type>BIGINT</data-type>
+            <name>git_revision</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>date</name>
-            <data-type>TIMESTAMP</data-type>
+            <name>mod_git_revision</name>
+            <data-type>VARCHAR(40)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>reason</name>
+            <name>upstream_package_repository</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>uses_upstream</name>
+            <data-type>BIT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>uses_modification</name>
+            <data-type>BIT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>commit_time</name>
+            <data-type>TIMESTAMP</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <name>upstream_flag_date</name>
+            <data-type>TIMESTAMP</data-type>
+            <required>False</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>id</name>
+            <data-type>SMALLINT</data-type>
+            <required>True</required>
+            <primary-key>True</primary-key>
+          </column>
+          <column>
+            <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>id</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>log_file_exists</name>
-            <data-type>BIT</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="{7b159780-7f39-45a7-9557-046874a57e43}">
+    <item id="{be821d83-a9b4-4c0c-8e1b-433730200714}" type="database-table">
       <position>
-        <x>-43</x>
-        <y>267</y>
+        <x>580</x>
+        <y>-71</y>
       </position>
       <table>
-        <name>fail_reasons</name>
+        <name>dependency_types</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1062,159 +1104,177 @@
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>identifier</name>
-            <data-type>VARCHAR(64)</data-type>
+            <name>relevant_for_building</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>severity</name>
-            <data-type>SMALLINT</data-type>
+            <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="{92f54126-a433-458e-80b7-67235e560334}">
+    <item id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}" type="database-table">
       <position>
-        <x>816</x>
-        <y>57</y>
+        <x>-42</x>
+        <y>529</y>
       </position>
       <table>
-        <name>repository_stability_relations</name>
+        <name>build_dependency_loops</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>more_stable</name>
+            <name>loop</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>less_stable</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>build_assignment</name>
+            <data-type>BIGINT</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="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}" type="database-table">
       <position>
-        <x>357</x>
-        <y>455</y>
+        <x>829</x>
+        <y>168</y>
       </position>
       <table>
-        <name>statitstics</name>
+        <name>repository_stabilities</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>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <name>stable_packages_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>name</name>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>pending_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>True</required>
+            <name>bugtracker_category</name>
+            <data-type>VARCHAR(32)</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{d823ab09-1c04-44ee-ad4b-6802208967ff}" type="database-table">
+      <position>
+        <x>793</x>
+        <y>497</y>
+      </position>
+      <table>
+        <name>repository_moves</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>pending_packages_count</name>
+            <name>id</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>staging_packages_count</name>
+            <name>from_repository</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>testing_packages_count</name>
+            <name>to_repository</name>
             <data-type>MEDIUMINT</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-list>
+      </table>
+    </item>
+    <item id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}" type="database-table">
+      <position>
+        <x>-55</x>
+        <y>-72</y>
+      </position>
+      <table>
+        <name>email_log</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>broken_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>dependency_loops_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>date</name>
+            <data-type>TIMESTAMP</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>dependency_looped_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>success</name>
+            <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>locked_tasks_count</name>
+            <name>action</name>
             <data-type>MEDIUMINT</data-type>
-            <required>True</required>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>blocked_tasks_count</name>
+            <name>count</name>
             <data-type>MEDIUMINT</data-type>
-            <required>True</required>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>next_tasks_count</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>True</required>
+            <name>gpg_key</name>
+            <data-type>BIGINT</data-type>
+            <required>False</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>architecture</name>
-            <data-type>SMALLINT</data-type>
-            <required>True</required>
+            <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="{dc01c567-d657-4db7-8a55-d2763ed00cee}">
+    <item id="{5f12db03-a8bb-4467-bab6-a57e545b9081}" type="database-table">
       <position>
-        <x>971</x>
-        <y>-69</y>
+        <x>-52</x>
+        <y>134</y>
       </position>
       <table>
-        <name>todos</name>
+        <name>ssh_log</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1224,87 +1284,51 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>file</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>
-            <name>line</name>
+            <name>build_slave</name>
             <data-type>MEDIUMINT</data-type>
-            <required>True</required>
-            <primary-key>False</primary-key>
-          </column>
-          <column>
-            <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="{36980651-4f03-4748-aee8-1f9211aaafde}">
-      <position>
-        <x>821</x>
-        <y>-49</y>
-      </position>
-      <table>
-        <name>todo_links</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>dependent</name>
-            <data-type>BIGINT</data-type>
+            <name>action</name>
+            <data-type>VARCHAR(32)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>depending_on</name>
-            <data-type>BIGINT</data-type>
+            <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="{75e4ebd8-5915-4aff-8316-0c542d3953da}">
-      <position>
-        <x>240</x>
-        <y>-66</y>
-      </position>
-      <table>
-        <name>persons</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
+            <name>duration</name>
             <data-type>MEDIUMINT</data-type>
-            <required>True</required>
-            <primary-key>True</primary-key>
+            <required>False</required>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(32)</data-type>
-            <required>True</required>
+            <name>exit_code</name>
+            <data-type>MEDIUMINT</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="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}" type="database-table">
       <position>
-        <x>92</x>
-        <y>-69</y>
+        <x>525</x>
+        <y>215</y>
       </position>
       <table>
-        <name>gpg_keys</name>
+        <name>binary_packages_in_repositories</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1314,33 +1338,39 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>fingerprint</name>
-            <data-type>VARCHAR(40)</data-type>
+            <name>package</name>
+            <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>owner</name>
+            <name>repository</name>
             <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>public_key</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="{b5671c08-e24a-4293-b983-3c86b1a6d622}">
+    <item id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}" type="database-table">
       <position>
-        <x>68</x>
-        <y>42</y>
+        <x>345</x>
+        <y>-71</y>
       </position>
       <table>
-        <name>allowed_email_actions</name>
+        <name>dependencies</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1350,51 +1380,45 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>gpg_key</name>
+            <name>dependent</name>
             <data-type>BIGINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>action</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-list>
-      </table>
-    </item>
-    <item type="database-table" id="{6180fcbf-5069-4d86-8919-fd39394f1813}">
-      <position>
-        <x>-54</x>
-        <y>70</y>
-      </position>
-      <table>
-        <name>email_actions</name>
-        <color>#ffffff</color>
-        <column-list>
           <column>
-            <name>id</name>
-            <data-type>MEDIUMINT</data-type>
+            <name>dependency_type</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
-            <primary-key>True</primary-key>
+            <primary-key>False</primary-key>
           </column>
           <column>
-            <name>name</name>
-            <data-type>VARCHAR(32)</data-type>
+            <name>version</name>
+            <data-type>BIGINT</data-type>
+            <required>True</required>
+            <primary-key>False</primary-key>
+          </column>
+          <column>
+            <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="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}">
+    <item id="{a67b38a9-c701-412c-8292-5ef58536da85}" type="database-table">
       <position>
-        <x>229</x>
-        <y>20</y>
+        <x>483</x>
+        <y>57</y>
       </position>
       <table>
-        <name>ssh_keys</name>
+        <name>versions</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1404,69 +1428,63 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>owner</name>
+            <name>order</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>fingerprint</name>
-            <data-type>TEXT</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 type="database-table" id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}">
+    <item id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}" type="database-table">
       <position>
-        <x>656</x>
-        <y>380</y>
+        <x>-31</x>
+        <y>605</y>
       </position>
       <table>
-        <name>architecture_compatibilities</name>
+        <name>toolchain_order</name>
         <color>#ffffff</color>
         <column-list>
           <column>
-            <name>id</name>
-            <data-type>MEDIUMINT</data-type>
-            <required>True</required>
-            <primary-key>True</primary-key>
-          </column>
-          <column>
-            <name>built_for</name>
+            <name>number</name>
             <data-type>SMALLINT</data-type>
             <required>True</required>
-            <primary-key>False</primary-key>
+            <primary-key>True</primary-key>
           </column>
           <column>
-            <name>runs_on</name>
-            <data-type>SMALLINT</data-type>
+            <name>pkgbase</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>fully_compatible</name>
+            <name>requires_all_dependencies_built</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
-          <column>
-            <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="{bb59ebca-0255-40dd-91b4-68bd2e110447}">
+    <item id="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}" type="database-table">
       <position>
-        <x>901</x>
-        <y>641</y>
+        <x>632</x>
+        <y>498</y>
       </position>
       <table>
-        <name>mirror_statuses</name>
+        <name>upstream_packages</name>
         <color>#ffffff</color>
         <column-list>
           <column>
@@ -1476,67 +1494,79 @@
             <primary-key>True</primary-key>
           </column>
           <column>
-            <name>protocol</name>
-            <data-type>VARCHAR(8)</data-type>
+            <name>pkgname</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>
+            <name>epoch</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>country</name>
+            <name>pkgver</name>
             <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>country_code</name>
-            <data-type>VARCHAR(4)</data-type>
+            <name>pkgrel</name>
+            <data-type>MEDIUMINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>last_sync</name>
-            <data-type>BIGINT</data-type>
+            <name>architecture</name>
+            <data-type>VARCHAR(6)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>start</name>
-            <data-type>FLOAT</data-type>
+            <name>repository</name>
+            <data-type>SMALLINT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+        </column-list>
+      </table>
+    </item>
+    <item id="{91a05cd7-dc02-474b-bd10-aab0f53ce9d7}" type="database-table">
+      <position>
+        <x>977</x>
+        <y>378</y>
+      </position>
+      <table>
+        <name>command_log</name>
+        <color>#ffffff</color>
+        <column-list>
           <column>
-            <name>stop</name>
-            <data-type>FLOAT</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>isos</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>ipv4</name>
-            <data-type>BIT</data-type>
+            <name>command</name>
+            <data-type>VARCHAR(64)</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>ipv6</name>
-            <data-type>BIT</data-type>
+            <name>parameters</name>
+            <data-type>TEXT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
           <column>
-            <name>active</name>
+            <name>shell</name>
             <data-type>BIT</data-type>
             <required>True</required>
             <primary-key>False</primary-key>
@@ -1544,57 +1574,57 @@
         </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>
@@ -1605,62 +1635,95 @@
           <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>93.3906</x>
-              <y>669.813</y>
+              <x>803</x>
+              <y>322.875</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/>
+            <angle>180</angle>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
           <connector>
             <position>
-              <x>181.755</x>
-              <y>694</y>
+              <x>476.547</x>
+              <y>390.703</y>
+            </position>
+            <angle>0</angle>
+            <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>4</child>
+          <parent>0</parent>
+        </columns>
+      </relationship>
+    </item>
+    <item id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}" type="database-relationship">
+      <line>
+        <connector-list>
+          <connector>
+            <position>
+              <x>282.328</x>
+              <y>20</y>
             </position>
             <angle>90</angle>
-            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
+            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
+          </connector>
+          <connector>
+            <position>
+              <x>275.289</x>
+              <y>-15.1875</y>
+            </position>
+            <angle>270</angle>
+            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Optional</child>
-          <parent>Optional</parent>
+          <child>Mandatory</child>
+          <parent>Mandatory</parent>
         </modality>
         <columns>
           <child>1</child>
-          <parent>1</parent>
+          <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}">
+    <item id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>446.115</x>
-              <y>35.8125</y>
+              <x>215.453</x>
+              <y>194.406</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>0</angle>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
           <connector>
             <position>
-              <x>524.594</x>
-              <y>57</y>
+              <x>282.328</x>
+              <y>84.8125</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
+            <angle>270</angle>
+            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
           </connector>
         </connector-list>
       </line>
@@ -1671,36 +1734,36 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}">
+    <item id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>604</x>
-              <y>118.938</y>
+              <x>-9.85156</x>
+              <y>48.8125</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
+            <angle>270</angle>
+            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
           </connector>
           <connector>
             <position>
-              <x>566.188</x>
-              <y>96.4063</y>
+              <x>-5.27344</x>
+              <y>70</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
+            <angle>90</angle>
+            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Mandatory</child>
+          <child>Optional</child>
           <parent>Mandatory</parent>
         </modality>
         <columns>
@@ -1709,24 +1772,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}">
+    <item id="{af592aac-17cd-415f-99e8-9cf164311215}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>496.672</x>
-              <y>-35.3958</y>
+              <x>56</x>
+              <y>58.4063</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>180</angle>
+            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
           </connector>
           <connector>
             <position>
-              <x>580</x>
-              <y>-31.5938</y>
+              <x>43.4531</x>
+              <y>95.4063</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/>
+            <angle>0</angle>
+            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
           </connector>
         </connector-list>
       </line>
@@ -1737,29 +1800,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="{80755775-c938-4545-b4eb-1f08cfb1f0cc}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>496.672</x>
-              <y>0.208333</y>
+              <x>130.789</x>
+              <y>26</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>90</angle>
+            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
           </connector>
           <connector>
             <position>
-              <x>653</x>
-              <y>46.4063</y>
+              <x>145.328</x>
+              <y>9.8125</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/>
+            <angle>270</angle>
+            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
           </connector>
         </connector-list>
       </line>
@@ -1770,62 +1833,62 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}">
+    <item id="{803ce991-1984-4cab-9bb8-48acabb347af}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>734.844</x>
-              <y>261.406</y>
+              <x>35.2969</x>
+              <y>-11.5938</y>
             </position>
             <angle>0</angle>
-            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
+            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
           </connector>
           <connector>
             <position>
-              <x>803</x>
-              <y>291.938</y>
+              <x>92</x>
+              <y>-29.5938</y>
             </position>
             <angle>180</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
-        <cardinality>OneToMany</cardinality>
+        <cardinality>OneToOne</cardinality>
         <modality>
           <child>Optional</child>
-          <parent>Optional</parent>
+          <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>5</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}">
+    <item id="{abba2005-f23b-445f-aea6-ff9365bc1569}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>395.557</x>
-              <y>35.8125</y>
+              <x>198.656</x>
+              <y>-29.5938</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
+            <angle>0</angle>
+            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
           </connector>
           <connector>
             <position>
-              <x>381.93</x>
-              <y>99</y>
+              <x>240</x>
+              <y>-40.5938</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>180</angle>
+            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
           </connector>
         </connector-list>
       </line>
@@ -1836,29 +1899,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}">
+    <item id="{172204a1-76e9-45fc-826f-b3d174112734}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>525</x>
-              <y>261.406</y>
+              <x>948.234</x>
+              <y>-32.0625</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
+            <angle>0</angle>
+            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
           </connector>
           <connector>
             <position>
-              <x>464.859</x>
-              <y>226.208</y>
+              <x>971</x>
+              <y>-38.0625</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>180</angle>
+            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
           </connector>
         </connector-list>
       </line>
@@ -1869,29 +1932,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>0</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}">
+    <item id="{bb03129e-aba8-4449-88c1-6c352745aeda}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>59.5313</x>
-              <y>194.406</y>
+              <x>948.234</x>
+              <y>-15.125</y>
             </position>
             <angle>0</angle>
-            <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/>
+            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
           </connector>
           <connector>
             <position>
-              <x>118</x>
-              <y>229.406</y>
+              <x>971</x>
+              <y>-7.125</y>
             </position>
             <angle>180</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
           </connector>
         </connector-list>
       </line>
@@ -1902,29 +1965,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}">
+    <item id="{fa899065-104a-466d-bc8c-16589a774a45}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>911.133</x>
-              <y>575.813</y>
+              <x>941.313</x>
+              <y>121.813</y>
             </position>
             <angle>270</angle>
-            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
+            <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/>
           </connector>
           <connector>
             <position>
-              <x>828.635</x>
-              <y>684</y>
+              <x>934.271</x>
+              <y>168</y>
             </position>
             <angle>90</angle>
-            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
+            <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
           </connector>
         </connector-list>
       </line>
@@ -1935,29 +1998,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}">
+    <item id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>871.755</x>
-              <y>497</y>
+              <x>878.656</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>859.469</x>
-              <y>353.813</y>
+              <x>881.635</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>
@@ -1973,24 +2036,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}">
+    <item id="{65ace480-001e-4e4e-912d-2a975ff995c8}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>950.51</x>
-              <y>497</y>
+              <x>6.57292</x>
+              <y>372</y>
             </position>
             <angle>90</angle>
-            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
+            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
           </connector>
           <connector>
             <position>
-              <x>915.938</x>
-              <y>353.813</y>
+              <x>4.9375</x>
+              <y>345.813</y>
             </position>
             <angle>270</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/>
           </connector>
         </connector-list>
       </line>
@@ -2001,29 +2064,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}">
+    <item id="{35556854-c6c3-45e8-9e10-bd5150680fd2}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>409.573</x>
-              <y>289.813</y>
+              <x>107.719</x>
+              <y>432.406</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>0</angle>
+            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
           </connector>
           <connector>
             <position>
-              <x>429.273</x>
-              <y>378</y>
+              <x>153</x>
+              <y>496.604</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <angle>180</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
@@ -2034,29 +2097,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>9</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}">
+    <item id="{307a930b-cbe8-4000-b89d-b6cc99479b19}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>887.703</x>
-              <y>261</y>
+              <x>57.1458</x>
+              <y>372</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>121.151</x>
+              <y>275.813</y>
             </position>
             <angle>270</angle>
-            <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
         </connector-list>
       </line>
@@ -2067,29 +2130,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 id="{40654aec-f5e1-4d82-a528-102a76a971d3}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>697.203</x>
-              <y>88</y>
+              <x>120.391</x>
+              <y>561.406</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
+            <angle>0</angle>
+            <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/>
           </connector>
           <connector>
             <position>
-              <x>703.016</x>
-              <y>71.8125</y>
+              <x>153</x>
+              <y>546.208</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>
@@ -2105,57 +2168,57 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}">
+    <item id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>604</x>
-              <y>149.875</y>
+              <x>168.302</x>
+              <y>275.813</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
+            <angle>270</angle>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
           <connector>
             <position>
-              <x>464.859</x>
-              <y>162.604</y>
+              <x>200.927</x>
+              <y>447</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>90</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Mandatory</child>
+          <child>Optional</child>
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}">
+    <item id="{883853fb-bda9-450c-bde3-77422973b925}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>339.266</x>
-              <y>768.406</y>
+              <x>354.286</x>
+              <y>303.813</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
+            <angle>270</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
           <connector>
             <position>
-              <x>729</x>
-              <y>716.406</y>
+              <x>248.854</x>
+              <y>447</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
+            <angle>90</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
         </connector-list>
       </line>
@@ -2166,29 +2229,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}">
+    <item id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>803.727</x>
-              <y>748.813</y>
+              <x>296.781</x>
+              <y>521.406</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
+            <angle>0</angle>
+            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
           </connector>
           <connector>
             <position>
-              <x>705.609</x>
-              <y>782.406</y>
+              <x>413.516</x>
+              <y>428.813</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/>
+            <angle>270</angle>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
@@ -2204,13 +2267,13 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}">
+    <item id="{1702ddc7-99c5-4af4-8731-eb8f4b6306d3}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>235.891</x>
-              <y>556.813</y>
+              <x>224.891</x>
+              <y>595.813</y>
             </position>
             <angle>270</angle>
             <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
@@ -2237,24 +2300,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}">
+    <item id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>307.781</x>
-              <y>482.406</y>
+              <x>803.727</x>
+              <y>748.813</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>270</angle>
+            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
           </connector>
           <connector>
             <position>
-              <x>382</x>
-              <y>403.406</y>
+              <x>705.609</x>
+              <y>782.406</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <angle>0</angle>
+            <hub owner="{b3c86235-971a-4d3e-873c-c4179aa96cbc}"/>
           </connector>
         </connector-list>
       </line>
@@ -2270,24 +2333,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{883853fb-bda9-450c-bde3-77422973b925}">
+    <item id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>354.286</x>
-              <y>289.813</y>
+              <x>339.266</x>
+              <y>768.406</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
+            <angle>0</angle>
+            <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
           </connector>
           <connector>
             <position>
-              <x>259.854</x>
-              <y>408</y>
+              <x>729</x>
+              <y>716.406</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>180</angle>
+            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
           </connector>
         </connector-list>
       </line>
@@ -2298,29 +2361,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}">
+    <item id="{89cacf0f-5195-48db-aace-02a13aa29eee}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>212.302</x>
-              <y>310.813</y>
+              <x>604</x>
+              <y>149.875</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <angle>180</angle>
+            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
           </connector>
           <connector>
             <position>
-              <x>211.927</x>
-              <y>408</y>
+              <x>464.859</x>
+              <y>167.271</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>0</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
         </connector-list>
       </line>
@@ -2331,29 +2394,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>3</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{40654aec-f5e1-4d82-a528-102a76a971d3}">
+    <item id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>59.1953</x>
-              <y>527</y>
+              <x>697.203</x>
+              <y>88</y>
             </position>
             <angle>90</angle>
-            <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/>
+            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
           </connector>
           <connector>
             <position>
-              <x>164</x>
-              <y>507.208</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>
@@ -2369,24 +2432,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}">
+    <item id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>79.1458</x>
-              <y>374</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>165.151</x>
-              <y>310.813</y>
+              <x>907.953</x>
+              <y>232.813</y>
             </position>
             <angle>270</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
           </connector>
         </connector-list>
       </line>
@@ -2397,29 +2460,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 id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>129.719</x>
-              <y>434.406</y>
+              <x>409.573</x>
+              <y>303.813</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
+            <angle>270</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
           <connector>
             <position>
-              <x>164</x>
-              <y>457.604</y>
+              <x>429.273</x>
+              <y>378</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}"/>
+            <angle>90</angle>
+            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
           </connector>
         </connector-list>
       </line>
@@ -2430,29 +2493,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>9</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}">
+    <item id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>28.5729</x>
-              <y>374</y>
+              <x>871.755</x>
+              <y>497</y>
             </position>
             <angle>90</angle>
-            <hub owner="{a774fcb7-1193-4b57-947c-135212695915}"/>
+            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
           </connector>
           <connector>
             <position>
-              <x>4.9375</x>
-              <y>345.813</y>
+              <x>859.469</x>
+              <y>353.813</y>
             </position>
             <angle>270</angle>
-            <hub owner="{7b159780-7f39-45a7-9557-046874a57e43}"/>
+            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
           </connector>
         </connector-list>
       </line>
@@ -2463,29 +2526,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="{6094d4c4-439f-4e6c-94e1-736ae145362a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>941.313</x>
-              <y>121.813</y>
+              <x>950.51</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>934.271</x>
-              <y>168</y>
+              <x>915.938</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>
@@ -2501,24 +2564,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}">
+    <item id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>878.656</x>
-              <y>121.813</y>
+              <x>911.133</x>
+              <y>575.813</y>
             </position>
             <angle>270</angle>
-            <hub owner="{92f54126-a433-458e-80b7-67235e560334}"/>
+            <hub owner="{d823ab09-1c04-44ee-ad4b-6802208967ff}"/>
           </connector>
           <connector>
             <position>
-              <x>881.635</x>
-              <y>168</y>
+              <x>828.635</x>
+              <y>684</y>
             </position>
             <angle>90</angle>
-            <hub owner="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}"/>
+            <hub owner="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}"/>
           </connector>
         </connector-list>
       </line>
@@ -2529,62 +2592,62 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}">
+    <item id="{9a650bd7-521d-499f-ac79-a0fd9226a656}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>948.234</x>
-              <y>-32.0625</y>
+              <x>59.5313</x>
+              <y>194.406</y>
             </position>
             <angle>0</angle>
-            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
+            <hub owner="{5f12db03-a8bb-4467-bab6-a57e545b9081}"/>
           </connector>
           <connector>
             <position>
-              <x>971</x>
-              <y>-38.0625</y>
+              <x>74</x>
+              <y>194.406</y>
             </position>
             <angle>180</angle>
-            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
+            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Mandatory</child>
+          <child>Optional</child>
           <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 id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>948.234</x>
-              <y>-15.125</y>
+              <x>525</x>
+              <y>261.406</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{36980651-4f03-4748-aee8-1f9211aaafde}"/>
+            <angle>180</angle>
+            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
           </connector>
           <connector>
             <position>
-              <x>971</x>
-              <y>-7.125</y>
+              <x>464.859</x>
+              <y>235.542</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{dc01c567-d657-4db7-8a55-d2763ed00cee}"/>
+            <angle>0</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
         </connector-list>
       </line>
@@ -2595,29 +2658,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>0</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}">
+    <item id="{f26515ec-f37f-4eb3-a07f-6d5077208806}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>198.656</x>
-              <y>-29.5938</y>
+              <x>395.557</x>
+              <y>35.8125</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
+            <angle>270</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>240</x>
-              <y>-40.5938</y>
+              <x>381.93</x>
+              <y>99</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
+            <angle>90</angle>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
         </connector-list>
       </line>
@@ -2628,62 +2691,62 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>1</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}">
+    <item id="{0213a360-5a3b-484f-82c7-320003506c8a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>35.2969</x>
-              <y>-11.5938</y>
+              <x>734.844</x>
+              <y>261.406</y>
             </position>
             <angle>0</angle>
-            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
+            <hub owner="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}"/>
           </connector>
           <connector>
             <position>
-              <x>92</x>
-              <y>-29.5938</y>
+              <x>803</x>
+              <y>291.938</y>
             </position>
             <angle>180</angle>
-            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
+            <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>5</child>
+          <child>2</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}">
+    <item id="{ab992baa-6a2c-441b-a290-da42a791eb95}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>142.789</x>
-              <y>42</y>
+              <x>496.672</x>
+              <y>0.208333</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
+            <angle>0</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>145.328</x>
-              <y>9.8125</y>
+              <x>653</x>
+              <y>46.4063</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{f31249ea-ab19-45a4-9427-1854379ad8e7}"/>
+            <angle>180</angle>
+            <hub owner="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}"/>
           </connector>
         </connector-list>
       </line>
@@ -2694,29 +2757,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 id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>68</x>
-              <y>74.4063</y>
+              <x>496.672</x>
+              <y>-35.3958</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{b5671c08-e24a-4293-b983-3c86b1a6d622}"/>
+            <angle>0</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>43.4531</x>
-              <y>95.4063</y>
+              <x>580</x>
+              <y>-31.5938</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
+            <angle>180</angle>
+            <hub owner="{be821d83-a9b4-4c0c-8e1b-433730200714}"/>
           </connector>
         </connector-list>
       </line>
@@ -2727,29 +2790,29 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>3</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}">
+    <item id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>-9.85156</x>
-              <y>48.8125</y>
+              <x>604</x>
+              <y>118.938</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}"/>
+            <angle>180</angle>
+            <hub owner="{f8caa2d5-11ba-485c-b273-8183713896bf}"/>
           </connector>
           <connector>
             <position>
-              <x>-5.27344</x>
-              <y>70</y>
+              <x>566.188</x>
+              <y>96.4063</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{6180fcbf-5069-4d86-8919-fd39394f1813}"/>
+            <angle>0</angle>
+            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
           </connector>
         </connector-list>
       </line>
@@ -2765,24 +2828,24 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}">
+    <item id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>188.727</x>
-              <y>148</y>
+              <x>446.115</x>
+              <y>35.8125</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}"/>
+            <angle>270</angle>
+            <hub owner="{caab4a73-46dc-49dc-ac51-d8ae916827c5}"/>
           </connector>
           <connector>
             <position>
-              <x>282.328</x>
-              <y>84.8125</y>
+              <x>524.594</x>
+              <y>57</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
+            <angle>90</angle>
+            <hub owner="{a67b38a9-c701-412c-8292-5ef58536da85}"/>
           </connector>
         </connector-list>
       </line>
@@ -2793,62 +2856,62 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>2</child>
+          <child>4</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}">
+    <item id="{64756b6f-e7d3-4995-8b5d-21d07292741f}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>282.328</x>
-              <y>20</y>
+              <x>93.3906</x>
+              <y>669.813</y>
             </position>
-            <angle>90</angle>
-            <hub owner="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}"/>
+            <angle>270</angle>
+            <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/>
           </connector>
           <connector>
             <position>
-              <x>275.289</x>
-              <y>-15.1875</y>
+              <x>181.755</x>
+              <y>694</y>
             </position>
-            <angle>270</angle>
-            <hub owner="{75e4ebd8-5915-4aff-8316-0c542d3953da}"/>
+            <angle>90</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>1</child>
-          <parent>0</parent>
+          <parent>1</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}">
+    <item id="{747ab82c-bbbf-498d-a6bd-13633c73fd6f}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>803</x>
-              <y>322.875</y>
+              <x>699.898</x>
+              <y>618.813</y>
             </position>
-            <angle>180</angle>
-            <hub owner="{844766fc-c5af-4f61-b51b-d3f9393c60ca}"/>
+            <angle>270</angle>
+            <hub owner="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}"/>
           </connector>
           <connector>
             <position>
-              <x>476.547</x>
-              <y>390.703</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>
@@ -2859,73 +2922,73 @@
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>4</child>
+          <child>6</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{30a694b2-681f-44ae-90bb-911220d65737}">
+    <item id="{279b4b3b-c166-4343-bce6-ff3dfb6669a0}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>656</x>
-              <y>441.875</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>416.109</y>
+              <x>445.031</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>2</child>
+          <child>14</child>
           <parent>0</parent>
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}">
+    <item id="{1f929538-fe3a-4c8f-8c6c-26ea441bd6e0}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>656</x>
-              <y>410.938</y>
+              <x>299</x>
+              <y>201.406</y>
             </position>
             <angle>180</angle>
-            <hub owner="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}"/>
+            <hub owner="{2e6c3b80-fef6-4d2b-8945-7ea6be1b646c}"/>
           </connector>
           <connector>
             <position>
-              <x>476.547</x>
-              <y>403.406</y>
+              <x>235.883</x>
+              <y>294</y>
             </position>
-            <angle>0</angle>
-            <hub owner="{04f424bf-6465-478b-9529-0038615b51d9}"/>
+            <angle>90</angle>
+            <hub owner="{44dd2d06-f012-46f7-a1a9-d38dd21b4287}"/>
           </connector>
         </connector-list>
       </line>
       <relationship>
         <cardinality>OneToOne</cardinality>
         <modality>
-          <child>Mandatory</child>
+          <child>Optional</child>
           <parent>Mandatory</parent>
         </modality>
         <columns>
-          <child>1</child>
+          <child>12</child>
           <parent>0</parent>
         </columns>
       </relationship>
diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index f67fcc3..3d00aac 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -484,6 +484,7 @@ binary_packages	CREATE TABLE `binary_packages` (
 	 `architecture` smallint(6) NOT NULL,
 	 `sha512sum` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
 	 `sub_pkgrel_omitted` bit(1) NOT NULL DEFAULT b'0',
+	 `compression` smallint(6) DEFAULT NULL,
 	 PRIMARY KEY (`id`),
 	 UNIQUE KEY `file_name` (`pkgname`,`epoch`,`pkgver`,`pkgrel`,`sub_pkgrel`,`architecture`,`sub_pkgrel_omitted`),
 	 UNIQUE KEY `content` (`build_assignment`,`sub_pkgrel`,`pkgname`,`architecture`,`sub_pkgrel_omitted`),
@@ -491,8 +492,10 @@ binary_packages	CREATE TABLE `binary_packages` (
 	 KEY `epoch` (`epoch`),
 	 KEY `pkgver` (`pkgver`),
 	 KEY `pkgname` (`pkgname`),
+	 KEY `compression` (`compression`),
 	 CONSTRAINT `binary_packages_ibfk_1` FOREIGN KEY (`architecture`) REFERENCES `architectures` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
-	 CONSTRAINT `binary_packages_ibfk_2` FOREIGN KEY (`build_assignment`) REFERENCES `build_assignments` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+	 CONSTRAINT `binary_packages_ibfk_2` FOREIGN KEY (`build_assignment`) REFERENCES `build_assignments` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+	 CONSTRAINT `binary_packages_ibfk_3` FOREIGN KEY (`compression`) REFERENCES `compressions` (`id`) ON DELETE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
 binary_packages_in_repositories	CREATE TABLE `binary_packages_in_repositories` (
 	 `id` bigint(20) NOT NULL AUTO_INCREMENT,
@@ -559,6 +562,12 @@ command_log	CREATE TABLE `command_log` (
 	 KEY `command` (`command`),
 	 KEY `shell` (`shell`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+compressions	CREATE TABLE `compressions` (
+	 `id` smallint(6) NOT NULL AUTO_INCREMENT,
+	 `suffix` varchar(8) COLLATE utf8mb4_unicode_ci NOT NULL,
+	 PRIMARY KEY (`id`),
+	 UNIQUE KEY `suffix` (`suffix`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
 dependencies	CREATE TABLE `dependencies` (
 	 `id` bigint(20) NOT NULL AUTO_INCREMENT,
 	 `dependent` bigint(20) NOT NULL,
@@ -868,6 +877,15 @@ INSERT INTO `architecture_compatibilities` VALUES
   (8,4,4,'1','1'),
   (9,2,4,'\0','1'),
   (10,3,4,'\0','\0');
+INSERT INTO `compressions` VALUES
+  (1,'tar'),
+  (3,'tar.bz2'),
+  (2,'tar.gz'),
+  (5,'tar.lzo'),
+  (6,'tar.lzr'),
+  (4,'tar.xz'),
+  (7,'tar.Z'),
+  (8,'tar.zst');
 INSERT INTO `dependency_types` VALUES
   (2,'run','1','1'),
   (3,'check','\0','\0'),
-- 
cgit v1.2.3-70-g09d2