misc/database-layout: `toolchain_order` has a new column `requires_all_dependencies_built` and a new key

1 files changed, 101 insertions, 95 deletions

diff --git a/misc/database-layout.dmf b/misc/database-layout.dmf
index a81a109..0a227c3 100644
--- a/misc/database-layout.dmf
+++ b/misc/database-layout.dmf
@@ -2,7 +2,7 @@
 <diagram xmlns="http://oxygene.sk/ns/diagram/1/">
   <notation>Relational</notation>
   <item-list>
-    <item type="database-table" id="{bb59ebca-0255-40dd-91b4-68bd2e110447}">
+    <item id="{bb59ebca-0255-40dd-91b4-68bd2e110447}" type="database-table">
       <position>
         <x>901</x>
         <y>641</y>
@@ -86,7 +86,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}">
+    <item id="{3d2d24a7-42f1-4c59-9cb3-a8d8478ac4a8}" type="database-table">
       <position>
         <x>656</x>
         <y>380</y>
@@ -128,7 +128,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}">
+    <item id="{33867a1e-ef36-4cc2-a08e-7366f56fbf5f}" type="database-table">
       <position>
         <x>229</x>
         <y>20</y>
@@ -158,7 +158,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{6180fcbf-5069-4d86-8919-fd39394f1813}">
+    <item id="{6180fcbf-5069-4d86-8919-fd39394f1813}" type="database-table">
       <position>
         <x>-54</x>
         <y>70</y>
@@ -182,7 +182,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{b5671c08-e24a-4293-b983-3c86b1a6d622}">
+    <item id="{b5671c08-e24a-4293-b983-3c86b1a6d622}" type="database-table">
       <position>
         <x>68</x>
         <y>42</y>
@@ -212,7 +212,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{f31249ea-ab19-45a4-9427-1854379ad8e7}">
+    <item id="{f31249ea-ab19-45a4-9427-1854379ad8e7}" type="database-table">
       <position>
         <x>92</x>
         <y>-69</y>
@@ -248,7 +248,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{75e4ebd8-5915-4aff-8316-0c542d3953da}">
+    <item id="{75e4ebd8-5915-4aff-8316-0c542d3953da}" type="database-table">
       <position>
         <x>240</x>
         <y>-66</y>
@@ -272,7 +272,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{36980651-4f03-4748-aee8-1f9211aaafde}">
+    <item id="{36980651-4f03-4748-aee8-1f9211aaafde}" type="database-table">
       <position>
         <x>821</x>
         <y>-49</y>
@@ -296,7 +296,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{dc01c567-d657-4db7-8a55-d2763ed00cee}">
+    <item id="{dc01c567-d657-4db7-8a55-d2763ed00cee}" type="database-table">
       <position>
         <x>971</x>
         <y>-69</y>
@@ -338,7 +338,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{9085c36f-5884-41c8-9ca8-9d53973e657d}">
+    <item id="{9085c36f-5884-41c8-9ca8-9d53973e657d}" type="database-table">
       <position>
         <x>357</x>
         <y>455</y>
@@ -440,7 +440,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{92f54126-a433-458e-80b7-67235e560334}">
+    <item id="{92f54126-a433-458e-80b7-67235e560334}" type="database-table">
       <position>
         <x>816</x>
         <y>57</y>
@@ -470,7 +470,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{7b159780-7f39-45a7-9557-046874a57e43}">
+    <item id="{7b159780-7f39-45a7-9557-046874a57e43}" type="database-table">
       <position>
         <x>-43</x>
         <y>267</y>
@@ -506,7 +506,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{a774fcb7-1193-4b57-947c-135212695915}">
+    <item id="{a774fcb7-1193-4b57-947c-135212695915}" type="database-table">
       <position>
         <x>-22</x>
         <y>374</y>
@@ -560,7 +560,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}">
+    <item id="{6ea5c997-98b5-4ec8-b63e-3f2acdcaf627}" type="database-table">
       <position>
         <x>164</x>
         <y>408</y>
@@ -626,7 +626,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}">
+    <item id="{a945e439-8796-49e8-aa9b-7ce0a58a2c26}" type="database-table">
       <position>
         <x>118</x>
         <y>148</y>
@@ -698,7 +698,7 @@
         </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>
@@ -782,7 +782,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{f8caa2d5-11ba-485c-b273-8183713896bf}">
+    <item id="{f8caa2d5-11ba-485c-b273-8183713896bf}" type="database-table">
       <position>
         <x>604</x>
         <y>88</y>
@@ -824,7 +824,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}">
+    <item id="{844766fc-c5af-4f61-b51b-d3f9393c60ca}" type="database-table">
       <position>
         <x>803</x>
         <y>261</y>
@@ -866,7 +866,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}">
+    <item id="{b3c86235-971a-4d3e-873c-c4179aa96cbc}" type="database-table">
       <position>
         <x>598</x>
         <y>736</y>
@@ -908,7 +908,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}">
+    <item id="{d01e6205-a6dc-4724-a1fd-d4b2f73637ea}" type="database-table">
       <position>
         <x>729</x>
         <y>684</y>
@@ -938,10 +938,10 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{7c210122-c51d-4724-b7cc-22f143bc47ac}">
+    <item id="{7c210122-c51d-4724-b7cc-22f143bc47ac}" type="database-table">
       <position>
-        <x>173</x>
-        <y>709</y>
+        <x>103</x>
+        <y>694</y>
       </position>
       <table>
         <name>package_sources</name>
@@ -998,7 +998,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{04f424bf-6465-478b-9529-0038615b51d9}">
+    <item id="{04f424bf-6465-478b-9529-0038615b51d9}" type="database-table">
       <position>
         <x>382</x>
         <y>378</y>
@@ -1022,7 +1022,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}">
+    <item id="{e84f8e5f-28e0-4d8b-a7e5-0f80a896f74e}" type="database-table">
       <position>
         <x>653</x>
         <y>21</y>
@@ -1046,7 +1046,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{be821d83-a9b4-4c0c-8e1b-433730200714}">
+    <item id="{be821d83-a9b4-4c0c-8e1b-433730200714}" type="database-table">
       <position>
         <x>580</x>
         <y>-71</y>
@@ -1082,10 +1082,10 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}">
+    <item id="{04b6fdc5-85ae-4416-8db5-034ad05be93a}" type="database-table">
       <position>
-        <x>-8</x>
-        <y>572</y>
+        <x>-22</x>
+        <y>527</y>
       </position>
       <table>
         <name>build_dependency_loops</name>
@@ -1112,7 +1112,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}">
+    <item id="{fee50b4d-969b-4b5f-8545-90ea8f8f7aec}" type="database-table">
       <position>
         <x>829</x>
         <y>168</y>
@@ -1142,7 +1142,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{d823ab09-1c04-44ee-ad4b-6802208967ff}">
+    <item id="{d823ab09-1c04-44ee-ad4b-6802208967ff}" type="database-table">
       <position>
         <x>793</x>
         <y>497</y>
@@ -1178,7 +1178,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}">
+    <item id="{5cbe15f1-fea8-48eb-a84f-97f7e22060f6}" type="database-table">
       <position>
         <x>-55</x>
         <y>-72</y>
@@ -1232,7 +1232,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{5f12db03-a8bb-4467-bab6-a57e545b9081}">
+    <item id="{5f12db03-a8bb-4467-bab6-a57e545b9081}" type="database-table">
       <position>
         <x>-52</x>
         <y>134</y>
@@ -1286,7 +1286,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}">
+    <item id="{b33d4844-b4e4-4ef6-944b-36b4113c2b82}" type="database-table">
       <position>
         <x>525</x>
         <y>215</y>
@@ -1328,7 +1328,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}">
+    <item id="{caab4a73-46dc-49dc-ac51-d8ae916827c5}" type="database-table">
       <position>
         <x>345</x>
         <y>-71</y>
@@ -1376,7 +1376,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{a67b38a9-c701-412c-8292-5ef58536da85}">
+    <item id="{a67b38a9-c701-412c-8292-5ef58536da85}" type="database-table">
       <position>
         <x>483</x>
         <y>57</y>
@@ -1412,10 +1412,10 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}">
+    <item id="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}" type="database-table">
       <position>
-        <x>-23</x>
-        <y>750</y>
+        <x>-31</x>
+        <y>605</y>
       </position>
       <table>
         <name>toolchain_order</name>
@@ -1433,10 +1433,16 @@
             <required>True</required>
             <primary-key>False</primary-key>
           </column>
+          <column>
+            <name>requires_all_dependencies_built</name>
+            <data-type>BIT</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}">
+    <item id="{fa0bc448-5ecc-4238-9d76-da742ab6eb14}" type="database-table">
       <position>
         <x>632</x>
         <y>498</y>
@@ -1490,7 +1496,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-table" id="{91a05cd7-dc02-474b-bd10-aab0f53ce9d7}">
+    <item id="{91a05cd7-dc02-474b-bd10-aab0f53ce9d7}" type="database-table">
       <position>
         <x>977</x>
         <y>378</y>
@@ -1532,7 +1538,7 @@
         </column-list>
       </table>
     </item>
-    <item type="database-relationship" id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}">
+    <item id="{f2d38c97-7a03-4454-8b95-7b35ba1c0304}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1565,7 +1571,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{30a694b2-681f-44ae-90bb-911220d65737}">
+    <item id="{30a694b2-681f-44ae-90bb-911220d65737}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1598,7 +1604,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}">
+    <item id="{25ec7ee3-9041-4ef4-a5b8-c41a06385813}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1631,7 +1637,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}">
+    <item id="{3539786a-db3b-4c5c-ba35-e89fb027cda8}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1664,7 +1670,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}">
+    <item id="{326ba5fe-513e-48e9-b924-51305ffa2aeb}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1697,7 +1703,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}">
+    <item id="{4174d8cf-11ae-4a89-bc89-ae6044cee76d}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1730,7 +1736,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{af592aac-17cd-415f-99e8-9cf164311215}">
+    <item id="{af592aac-17cd-415f-99e8-9cf164311215}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1763,7 +1769,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}">
+    <item id="{80755775-c938-4545-b4eb-1f08cfb1f0cc}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1796,7 +1802,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{803ce991-1984-4cab-9bb8-48acabb347af}">
+    <item id="{803ce991-1984-4cab-9bb8-48acabb347af}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1829,7 +1835,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{abba2005-f23b-445f-aea6-ff9365bc1569}">
+    <item id="{abba2005-f23b-445f-aea6-ff9365bc1569}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1862,7 +1868,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{172204a1-76e9-45fc-826f-b3d174112734}">
+    <item id="{172204a1-76e9-45fc-826f-b3d174112734}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1895,7 +1901,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{bb03129e-aba8-4449-88c1-6c352745aeda}">
+    <item id="{bb03129e-aba8-4449-88c1-6c352745aeda}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1928,7 +1934,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{fa899065-104a-466d-bc8c-16589a774a45}">
+    <item id="{fa899065-104a-466d-bc8c-16589a774a45}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1961,7 +1967,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}">
+    <item id="{8f5f94cd-2919-43f6-ae67-6b783850a2e7}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -1994,7 +2000,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{65ace480-001e-4e4e-912d-2a975ff995c8}">
+    <item id="{65ace480-001e-4e4e-912d-2a975ff995c8}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2027,7 +2033,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{35556854-c6c3-45e8-9e10-bd5150680fd2}">
+    <item id="{35556854-c6c3-45e8-9e10-bd5150680fd2}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2060,7 +2066,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{307a930b-cbe8-4000-b89d-b6cc99479b19}">
+    <item id="{307a930b-cbe8-4000-b89d-b6cc99479b19}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2093,13 +2099,13 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{40654aec-f5e1-4d82-a528-102a76a971d3}">
+    <item id="{40654aec-f5e1-4d82-a528-102a76a971d3}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>73.1953</x>
-              <y>572</y>
+              <x>59.1953</x>
+              <y>527</y>
             </position>
             <angle>90</angle>
             <hub owner="{04b6fdc5-85ae-4416-8db5-034ad05be93a}"/>
@@ -2126,7 +2132,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}">
+    <item id="{41ee8002-8436-4c74-9f79-75b7a8b9d0bf}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2159,7 +2165,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{883853fb-bda9-450c-bde3-77422973b925}">
+    <item id="{883853fb-bda9-450c-bde3-77422973b925}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2192,7 +2198,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}">
+    <item id="{2e8b92fe-d2c0-47e0-91b6-d1667772d162}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2225,7 +2231,7 @@
         </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>
@@ -2238,8 +2244,8 @@
           </connector>
           <connector>
             <position>
-              <x>291.133</x>
-              <y>709</y>
+              <x>260.51</x>
+              <y>694</y>
             </position>
             <angle>90</angle>
             <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
@@ -2258,7 +2264,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}">
+    <item id="{fb5f9b76-6f5d-4c06-b7dd-f89583096ba7}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2291,13 +2297,13 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}">
+    <item id="{48ec4e54-ceb5-48f1-b773-9ab92f6c1c5a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>409.266</x>
-              <y>776.406</y>
+              <x>339.266</x>
+              <y>761.406</y>
             </position>
             <angle>0</angle>
             <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
@@ -2324,7 +2330,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{89cacf0f-5195-48db-aace-02a13aa29eee}">
+    <item id="{89cacf0f-5195-48db-aace-02a13aa29eee}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2357,7 +2363,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}">
+    <item id="{9a1b5925-a86a-470b-9c2b-3132fdcfc87e}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2390,7 +2396,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}">
+    <item id="{67f0b7bd-a201-45d1-b18c-db46a8de0480}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2423,7 +2429,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}">
+    <item id="{c54c97e3-dd0a-4b21-9eeb-708d5b492e2a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2456,7 +2462,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}">
+    <item id="{4b0f5386-c5f6-4fa4-9c78-f0d85410c366}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2489,7 +2495,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{6094d4c4-439f-4e6c-94e1-736ae145362a}">
+    <item id="{6094d4c4-439f-4e6c-94e1-736ae145362a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2522,7 +2528,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}">
+    <item id="{30efa4b2-f4e7-4c8d-943e-44c699e54853}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2555,7 +2561,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{9a650bd7-521d-499f-ac79-a0fd9226a656}">
+    <item id="{9a650bd7-521d-499f-ac79-a0fd9226a656}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2588,7 +2594,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}">
+    <item id="{c672e45e-2bd4-4ff1-9b42-fdd2443cae6a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2621,7 +2627,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{f26515ec-f37f-4eb3-a07f-6d5077208806}">
+    <item id="{f26515ec-f37f-4eb3-a07f-6d5077208806}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2654,7 +2660,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{0213a360-5a3b-484f-82c7-320003506c8a}">
+    <item id="{0213a360-5a3b-484f-82c7-320003506c8a}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2687,7 +2693,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{ab992baa-6a2c-441b-a290-da42a791eb95}">
+    <item id="{ab992baa-6a2c-441b-a290-da42a791eb95}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2720,7 +2726,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}">
+    <item id="{d3ded37c-70d5-4388-8e27-2329f59a1d9c}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2753,7 +2759,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}">
+    <item id="{3016bcca-8c69-49ae-b7af-6f236ee0a018}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2786,7 +2792,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}">
+    <item id="{8e252eee-d544-482b-9a11-ba30ff6b4ebd}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2819,23 +2825,23 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{64756b6f-e7d3-4995-8b5d-21d07292741f}">
+    <item id="{64756b6f-e7d3-4995-8b5d-21d07292741f}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
             <position>
-              <x>85.5469</x>
-              <y>775.406</y>
+              <x>93.3906</x>
+              <y>669.813</y>
             </position>
-            <angle>0</angle>
+            <angle>270</angle>
             <hub owner="{fdd7ff7b-7a96-4625-9287-820e1b076c2a}"/>
           </connector>
           <connector>
             <position>
-              <x>173</x>
-              <y>776.406</y>
+              <x>181.755</x>
+              <y>694</y>
             </position>
-            <angle>180</angle>
+            <angle>90</angle>
             <hub owner="{7c210122-c51d-4724-b7cc-22f143bc47ac}"/>
           </connector>
         </connector-list>
@@ -2852,7 +2858,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{747ab82c-bbbf-498d-a6bd-13633c73fd6f}">
+    <item id="{747ab82c-bbbf-498d-a6bd-13633c73fd6f}" type="database-relationship">
       <line>
         <connector-list>
           <connector>
@@ -2885,7 +2891,7 @@
         </columns>
       </relationship>
     </item>
-    <item type="database-relationship" id="{279b4b3b-c166-4343-bce6-ff3dfb6669a0}">
+    <item id="{279b4b3b-c166-4343-bce6-ff3dfb6669a0}" type="database-relationship">
       <line>
         <connector-list>
           <connector>