Add indexes and primary keys.

diff --git a/db_structure.xml b/db_structure.xml
index 3ce41096d9ed525fe2c7ea32dda053de22c9aab4..c8a0b268968cb2ed744f8865fe25437289aa586f 100644 (file)
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -37,6 +37,8 @@
 
                        <index>
                                <name>appconfig_appid_key_index</name>
+                               <primary>true</primary>
+                               <unique>true</unique>
                                <field>
                                        <name>appid</name>
                                        <sorting>ascending</sorting>
@@ -134,6 +136,7 @@
 
                        <index>
                                <name>file_map_lp_index</name>
+                               <primary>true</primary>
                                <unique>true</unique>
                                <field>
                                        <name>logic_path_hash</name>
@@ -379,6 +382,7 @@
                        <index>
                                <name>id_user_index</name>
                                <unique>true</unique>
+                               <primary>true</primary>
                                <field>
                                        <name>fileid</name>
                                        <sorting>ascending</sorting>
@@ -415,6 +419,20 @@
                                <length>64</length>
                        </field>
 
+                       <index>
+                               <name>gu_gid_uid_index</name>
+                               <primary>true</primary>
+                               <unique>true</unique>
+                               <field>
+                                       <name>gid</name>
+                                       <sorting>ascending</sorting>
+                               </field>
+                               <field>
+                                       <name>uid</name>
+                                       <sorting>ascending</sorting>
+                               </field>
+                       </index>
+
                </declaration>
 
        </table>
@@ -448,6 +466,20 @@
                                </field>
                        </index>
 
+                       <index>
+                               <name>ga_gid_uid_index</name>
+                               <primary>true</primary>
+                               <unique>true</unique>
+                               <field>
+                                       <name>gid</name>
+                                       <sorting>ascending</sorting>
+                               </field>
+                               <field>
+                                       <name>uid</name>
+                                       <sorting>ascending</sorting>
+                               </field>
+                       </index>
+
                </declaration>
 
        </table>
@@ -596,6 +628,8 @@
 
                        <index>
                                <name>pref_userid_appid_key_index</name>
+                               <primary>true</primary>
+                               <unique>true</unique>
                                <field>
                                        <name>userid</name>
                                        <sorting>ascending</sorting>
@@ -620,6 +654,15 @@
 
                <declaration>
 
+                       <field>
+                               <name>id</name>
+                               <autoincrement>1</autoincrement>
+                               <type>integer</type>
+                               <default>0</default>
+                               <notnull>true</notnull>
+                               <length>4</length>
+                       </field>
+
                        <field>
                                <name>userid</name>
                                <type>text</type>
@@ -651,6 +694,17 @@
                                <length>255</length>
                        </field>
 
+                       <index>
+                               <name>user_propertypath_index</name>
+                               <field>
+                                       <name>userid</name>
+                                       <sorting>ascending</sorting>
+                               </field>
+                               <field>
+                                       <name>propertypath</name>
+                                       <sorting>ascending</sorting>
+                               </field>
+                       </index>
                </declaration>
 
        </table>

diff --git a/lib/util.php b/lib/util.php
index e79daae8a0a2da3a4b02effcde6749e4d7a4d96e..fad49ac5ab25ceb81c5f9cbed0c598050822dd82 100755 (executable)
--- a/lib/util.php
+++ b/lib/util.php
@@ -75,7 +75,7 @@ class OC_Util {
        public static function getVersion() {
                // hint: We only can count up. Reset minor/patchlevel when
                // updating major/minor version number.
-               return array(5, 80, 00);
+               return array(5, 80, 01);
        }
 
        /**