Merge pull request #8956 from TobiasLounsbury/CRM-19278

[civicrm-core.git] / xml / schema / Core / Setting.xml

diff --git a/xml/schema/Core/Setting.xml b/xml/schema/Core/Setting.xml
index 08f2978b9c82857cca89c4f4415c45d77253354b..d2865d352b245cb719a81d9fb358e37e7e439c3a 100644 (file)
--- a/xml/schema/Core/Setting.xml
+++ b/xml/schema/Core/Setting.xml
@@ -7,38 +7,40 @@
   <comment>Table to store civicrm settings for civicrm core and components.</comment>
   <add>4.1</add>
   <field>
-      <name>id</name>
+    <name>id</name>
     <title>Setting ID</title>
-      <type>int unsigned</type>
-      <required>true</required>
-      <add>4.1</add>
+    <type>int unsigned</type>
+    <required>true</required>
+    <add>4.1</add>
   </field>
   <primaryKey>
-       <name>id</name>
-       <autoincrement>true</autoincrement>
+    <name>id</name>
+    <autoincrement>true</autoincrement>
   </primaryKey>
   <field>
-       <name>group_name</name>
+    <name>group_name</name>
     <title>Setting Group</title>
-       <type>varchar</type>
-       <length>64</length>
-       <required>true</required>
-       <comment>group name for setting element, useful in caching setting elements</comment>
-       <add>4.1</add>
+    <type>varchar</type>
+    <length>64</length>
+    <required>true</required>
+    <comment>group name for setting element, useful in caching setting elements</comment>
+    <add>4.1</add>
+    <drop>4.7</drop>
   </field>
   <field>
-       <name>name</name>
+    <name>name</name>
     <title>Setting Name</title>
-       <type>varchar</type>
-       <length>255</length>
-       <comment>Unique name for setting</comment>
-       <add>4.1</add>
+    <type>varchar</type>
+    <length>255</length>
+    <comment>Unique name for setting</comment>
+    <add>4.1</add>
   </field>
   <index>
     <name>index_group_name</name>
     <fieldName>group_name</fieldName>
     <fieldName>name</fieldName>
     <add>4.1</add>
+    <drop>4.7</drop>
   </index>
   <field>
     <name>value</name>
@@ -47,45 +49,45 @@
     <add>4.1</add>
   </field>
   <field>
-      <name>domain_id</name>
+    <name>domain_id</name>
     <title>Setting Domain</title>
-      <type>int unsigned</type>
-      <required>true</required>
-      <pseudoconstant>
-          <table>civicrm_domain</table>
-          <keyColumn>id</keyColumn>
-          <labelColumn>name</labelColumn>
-      </pseudoconstant>
-      <comment>Which Domain is this menu item for</comment>
-      <add>4.1</add>
+    <type>int unsigned</type>
+    <required>true</required>
+    <pseudoconstant>
+      <table>civicrm_domain</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
+    <comment>Which Domain is this menu item for</comment>
+    <add>4.1</add>
   </field>
   <foreignKey>
-       <name>domain_id</name>
-       <table>civicrm_domain</table>
-       <key>id</key>
-       <onDelete>CASCADE</onDelete>
-       <add>4.1</add>
+    <name>domain_id</name>
+    <table>civicrm_domain</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+    <add>4.1</add>
   </foreignKey>
   <field>
-      <name>contact_id</name>
+    <name>contact_id</name>
     <title>Setting Contact</title>
-      <type>int unsigned</type>
-      <comment>FK to Contact ID if the setting is localized to a contact</comment>
-      <add>4.1</add>
+    <type>int unsigned</type>
+    <comment>FK to Contact ID if the setting is localized to a contact</comment>
+    <add>4.1</add>
   </field>
   <foreignKey>
-       <name>contact_id</name>
-       <table>civicrm_contact</table>
-       <key>id</key>
-       <onDelete>CASCADE</onDelete>
-       <add>4.1</add>
+    <name>contact_id</name>
+    <table>civicrm_contact</table>
+    <key>id</key>
+    <onDelete>CASCADE</onDelete>
+    <add>4.1</add>
   </foreignKey>
   <field>
-       <name>is_domain</name>
+    <name>is_domain</name>
     <title>Is Domain Setting?</title>
-       <type>boolean</type>
-       <comment>Is this setting a contact specific or site wide setting?</comment>
-       <add>4.1</add>
+    <type>boolean</type>
+    <comment>Is this setting a contact specific or site wide setting?</comment>
+    <add>4.1</add>
   </field>
   <field>
     <name>component_id</name>
@@ -103,10 +105,10 @@
     </html>
   </field>
   <foreignKey>
-       <name>component_id</name>
-       <table>civicrm_component</table>
-       <key>id</key>
-       <add>4.1</add>
+    <name>component_id</name>
+    <table>civicrm_component</table>
+    <key>id</key>
+    <add>4.1</add>
   </foreignKey>
   <field>
     <name>created_date</name>
@@ -129,4 +131,13 @@
     <add>4.1</add>
     <onDelete>SET NULL</onDelete>
   </foreignKey>
+  <index>
+    <name>index_domain_contact_name</name>
+    <fieldName>domain_id</fieldName>
+    <fieldName>contact_id</fieldName>
+    <fieldName>name</fieldName>
+    <unique>true</unique>
+    <add>4.7</add>
+  </index>
+
 </table>