From 6134e554f2306c5309a793d4d3149a0f9b05ea5f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 2 Oct 2012 23:46:35 +0200
Subject: new filecache table

---
 db_structure.xml | 92 ++++++++++++++++++--------------------------------------
 lib/util.php     |  2 +-
 2 files changed, 30 insertions(+), 64 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 99a30cb6137..8bbc6e5cc6b 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -53,19 +53,27 @@
 
 	<table>
 
-		<name>*dbprefix*fscache</name>
+		<name>*dbprefix*filecache</name>
 
 		<declaration>
 
 			<field>
-				<name>id</name>
-				<autoincrement>1</autoincrement>
+				<name>fileid</name>
 				<type>integer</type>
 				<default>0</default>
 				<notnull>true</notnull>
+				<autoincrement>1</autoincrement>
 				<length>4</length>
 			</field>
 
+			<field>
+				<name>storage</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
 			<field>
 				<name>path</name>
 				<type>text</type>
@@ -85,49 +93,17 @@
 			<field>
 				<name>parent</name>
 				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>8</length>
-			</field>
-
-			<field>
-				<name>name</name>
-				<type>text</type>
 				<default></default>
 				<notnull>true</notnull>
-				<length>300</length>
+				<length>4</length>
 			</field>
 
 			<field>
-				<name>user</name>
+				<name>name</name>
 				<type>text</type>
 				<default></default>
 				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-
-			<field>
-				<name>size</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>8</length>
-			</field>
-
-			<field>
-				<name>ctime</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>8</length>
-			</field>
-
-			<field>
-				<name>mtime</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>8</length>
+				<length>250</length>
 			</field>
 
 			<field>
@@ -135,7 +111,7 @@
 				<type>text</type>
 				<default></default>
 				<notnull>true</notnull>
-				<length>96</length>
+				<length>64</length>
 			</field>
 
 			<field>
@@ -147,55 +123,45 @@
 			</field>
 
 			<field>
-				<name>encrypted</name>
+				<name>size</name>
 				<type>integer</type>
-				<default>0</default>
+				<default></default>
 				<notnull>true</notnull>
-				<length>1</length>
+				<length>4</length>
 			</field>
 
 			<field>
-				<name>versioned</name>
+				<name>mtime</name>
 				<type>integer</type>
-				<default>0</default>
+				<default></default>
 				<notnull>true</notnull>
-				<length>1</length>
+				<length>4</length>
 			</field>
 
 			<field>
-				<name>writable</name>
+				<name>encrypted</name>
 				<type>integer</type>
 				<default>0</default>
 				<notnull>true</notnull>
-				<length>1</length>
+				<length>4</length>
 			</field>
 
 			<index>
-				<name>fscache_path_hash_index</name>
-				<field>
-					<name>path_hash</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-
-			<index>
-				<name>parent_index</name>
+				<name>storage_path_hash</name>
+				<unique>true</unique>
 				<field>
-					<name>parent</name>
+					<name>storage</name>
 					<sorting>ascending</sorting>
 				</field>
-			</index>
-
-			<index>
-				<name>name_index</name>
 				<field>
-					<name>name</name>
+					<name>path_hash</name>
 					<sorting>ascending</sorting>
 				</field>
 			</index>
 
 			<index>
-				<name>parent_name_index</name>
+				<name>parent_name_hash</name>
+				<unique>true</unique>
 				<field>
 					<name>parent</name>
 					<sorting>ascending</sorting>
diff --git a/lib/util.php b/lib/util.php
index 31dd376b9cc..264d61319dd 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ class OC_Util {
 	 */
 	public static function getVersion() {
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4.9.0. This is not visible to the user
-		return array(4,86,11);
+		return array(4,86,12);
 	}
 
 	/**
-- 
cgit v1.2.3