Database changes

htdocs/artefact/internal/db/install.xml

@@ -4,17 +4,19 @@
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
 <TABLES>
+    <!-- This isn't required anymore ... I think ...
     <TABLE NAME="artefact_internal_profile">
         <FIELDS>
-            <FIELD NAME="user" TYPE="int" LENGTH="10" NOTNULL="true" />
+            <FIELD NAME="owner" TYPE="int" LENGTH="10" NOTNULL="true" />
             <FIELD NAME="field" TYPE="char" LENGTH="100" NOTNULL="true" />
             <FIELD NAME="value" TYPE="text" NOTNULL="true" />
         </FIELDS>
         <KEYS>
-            <KEY NAME="primary" TYPE="primary" FIELDS="user,field" />
-            <KEY NAME="userfk" TYPE="foreign" FIELDS="user" REFTABLE="usr" REFFIELDS="id" />
+            <KEY NAME="primary" TYPE="primary" FIELDS="owner,field" />
+            <KEY NAME="ownerfk" TYPE="foreign" FIELDS="owner" REFTABLE="usr" REFFIELDS="id" />
         </KEYS>
     </TABLE>
+    -->
     <TABLE NAME="artefact_internal_profile_email">
         <FIELDS>
             <FIELD NAME="user" TYPE="int" LENGTH="10" NOTNULL="true" />
@@ -39,4 +41,4 @@
         </KEYS>
     </TABLE>
 </TABLES>
-</XMLDB>
\ No newline at end of file
+</XMLDB>

htdocs/lib/db/install.xml

@@ -221,13 +221,11 @@
         </TABLE>
         <TABLE NAME="artefact_installed_type">
             <FIELDS>
-                <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true" />
                 <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" />
                 <FIELD NAME="plugin" TYPE="char" LENGTH="255" NOTNULL="true" />
             </FIELDS>
             <KEYS>
-                <KEY NAME="primary" TYPE="primary" FIELDS="id" />
-                <KEY NAME="nameuk" TYPE="unique" FIELDS="name,plugin"  />
+                <KEY NAME="primary" TYPE="primary" FIELDS="name" />
                 <KEY NAME="pluginfk" TYPE="foreign" FIELDS="plugin" REFTABLE="artefact_installed" REFFIELDS="name" />
             </KEYS>
         </TABLE>
@@ -290,7 +288,7 @@
             </FIELDS>
             <KEYS>
                 <KEY NAME="primary" TYPE="primary" FIELDS="id" />
-                <KEY NAME="typefk" TYPE="foreign" FIELDS="artefacttype" REFTABLE="artefact_installed_type" REFFIELDS="id"  />
+                <KEY NAME="typefk" TYPE="foreign" FIELDS="artefacttype" REFTABLE="artefact_installed_type" REFFIELDS="name"  />
                 <KEY NAME="parentfk" TYPE="foreign" FIELDS="parent" REFTABLE="artefact" REFFIELDS="id" />
                 <KEY NAME="usrfk" TYPE="foreign" FIELDS="owner" REFTABLE="usr" REFFIELDS="id" />
             </KEYS>