From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Thu, 22 Oct 2009 18:12:30 +0000 (-0400)
Subject: Remove resource_category fields from storage, add indexes on resource_type and resour... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1543f4607496ed746ebe133c5e14cbbf8208ad8b;p=horde.git

Remove resource_category fields from storage, add indexes on resource_type and resource_calendar.
---

diff --git a/kronolith/scripts/sql/kronolith.mssql.sql b/kronolith/scripts/sql/kronolith.mssql.sql
index 4c9c5228c..91e0e17e8 100644
--- a/kronolith/scripts/sql/kronolith.mssql.sql
+++ b/kronolith/scripts/sql/kronolith.mssql.sql
@@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid);
 
 
 CREATE TABLE kronolith_storage (
-    vfb_owner      VARCHAR(255) DEFAULT NULL,
-    vfb_email      VARCHAR(255) DEFAULT '' NOT NULL,
+    vfb_owner      VARCHAR(255),
+    vfb_email      VARCHAR(255) NOT NULL,
     vfb_serialized VARCHAR(MAX) NOT NULL
 );
 
@@ -85,10 +85,12 @@ CREATE TABLE kronolith_resources (
     resource_name VARCHAR(255),
     resource_calendar VARCHAR(255),
     resource_description VARCHAR(MAX),
-    resource_category VARCHAR(255) DEFAULT '',
-    resource_response_type INT DEFAULT 0,
+    resource_response_type INT,
     resource_type VARCHAR(255) NOT NULL,
-    resource_members BLOB,
+    resource_members VARCHAR(MAX),
     
     PRIMARY KEY (resource_id)
 );
+
+CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
+CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
\ No newline at end of file
diff --git a/kronolith/scripts/sql/kronolith.mysql.sql b/kronolith/scripts/sql/kronolith.mysql.sql
index 460f2648f..25a1000df 100644
--- a/kronolith/scripts/sql/kronolith.mysql.sql
+++ b/kronolith/scripts/sql/kronolith.mysql.sql
@@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid);
 
 
 CREATE TABLE kronolith_storage (
-    vfb_owner      VARCHAR(255) DEFAULT NULL,
-    vfb_email      VARCHAR(255) DEFAULT '' NOT NULL,
+    vfb_owner      VARCHAR(255),
+    vfb_email      VARCHAR(255) NOT NULL,
     vfb_serialized TEXT NOT NULL
 );
 
@@ -79,3 +79,18 @@ CREATE TABLE kronolith_shares_users (
 CREATE INDEX kronolith_shares_users_share_id_idx ON kronolith_shares_users (share_id);
 CREATE INDEX kronolith_shares_users_user_uid_idx ON kronolith_shares_users (user_uid);
 CREATE INDEX kronolith_shares_users_perm_idx ON kronolith_shares_users (perm);
+
+CREATE TABLE kronolith_resources (
+    resource_id INT NOT NULL,
+    resource_name VARCHAR(255),
+    resource_calendar VARCHAR(255),
+    resource_description TEXT,
+    resource_response_type INT,
+    resource_type VARCHAR(255) NOT NULL,
+    resource_members TEXT,
+
+    PRIMARY KEY (resource_id)
+);
+
+CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
+CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
diff --git a/kronolith/scripts/sql/kronolith.oci8.sql b/kronolith/scripts/sql/kronolith.oci8.sql
index a04ff285e..2a6c23eed 100644
--- a/kronolith/scripts/sql/kronolith.oci8.sql
+++ b/kronolith/scripts/sql/kronolith.oci8.sql
@@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid);
 
 
 CREATE TABLE kronolith_storage (
-    vfb_owner      VARCHAR2(255) DEFAULT NULL,
-    vfb_email      VARCHAR2(255) DEFAULT '' NOT NULL,
+    vfb_owner      VARCHAR2(255),
+    vfb_email      VARCHAR2(255) NOT NULL,
     vfb_serialized VARCHAR2(4000) NOT NULL
 );
 
@@ -85,10 +85,13 @@ CREATE TABLE kronolith_resources (
     resource_name VARCHAR2(255),
     resource_calendar VARCHAR2(255),
     resource_description CLOB,
-    resource_category VARCHAR2(255) DEFAULT '',
-    resource_response_type NUMBER(16) DEFAULT 0,
+    resource_response_type NUMBER(16),
     resource_type VARCHAR2(255) NOT NULL,
+
     resource_members CLOB,
     
     PRIMARY KEY (resource_id)
 );
+
+CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
+CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
\ No newline at end of file
diff --git a/kronolith/scripts/sql/kronolith.pgsql.sql b/kronolith/scripts/sql/kronolith.pgsql.sql
index 121e131e7..198e4095d 100644
--- a/kronolith/scripts/sql/kronolith.pgsql.sql
+++ b/kronolith/scripts/sql/kronolith.pgsql.sql
@@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid);
 
 
 CREATE TABLE kronolith_storage (
-    vfb_owner      VARCHAR(255) DEFAULT NULL,
-    vfb_email      VARCHAR(255) DEFAULT '' NOT NULL,
+    vfb_owner      VARCHAR(255),
+    vfb_email      VARCHAR(255) NOT NULL,
     vfb_serialized TEXT NOT NULL
 );
 
@@ -85,10 +85,12 @@ CREATE TABLE kronolith_resources (
     resource_name VARCHAR(255),
     resource_calendar VARCHAR(255),
     resource_description TEXT,
-    resource_category VARCHAR(255) DEFAULT '',
-    resource_response_type INT DEFAULT 0,
+    resource_response_type INT,
     resource_type VARCHAR(255) NOT NULL,
     resource_members TEXT,
     
     PRIMARY KEY (resource_id)
 );
+
+CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
+CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
\ No newline at end of file
diff --git a/kronolith/scripts/sql/kronolith.sql b/kronolith/scripts/sql/kronolith.sql
index a823d27ef..08e7fabba 100644
--- a/kronolith/scripts/sql/kronolith.sql
+++ b/kronolith/scripts/sql/kronolith.sql
@@ -31,8 +31,8 @@ CREATE INDEX kronolith_uid_idx ON kronolith_events (event_uid);
 
 
 CREATE TABLE kronolith_storage (
-    vfb_owner      VARCHAR(255) DEFAULT NULL,
-    vfb_email      VARCHAR(255) DEFAULT '' NOT NULL,
+    vfb_owner      VARCHAR(255),
+    vfb_email      VARCHAR(255) NOT NULL,
     vfb_serialized TEXT NOT NULL
 );
 
@@ -85,11 +85,12 @@ CREATE TABLE kronolith_resources (
     resource_name VARCHAR(255),
     resource_calendar VARCHAR(255),
     resource_description TEXT,
-    resource_category VARCHAR(255) DEFAULT '',
-    resource_response_type INT DEFAULT 0,
+    resource_response_type INT,
     resource_type VARCHAR(255) NOT NULL,
-    resource_members BLOB,
-    
+    resource_members TEXT,
+
     PRIMARY KEY (resource_id)
 );
-    
\ No newline at end of file
+
+CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
+CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
diff --git a/kronolith/scripts/sql/kronolith.xml b/kronolith/scripts/sql/kronolith.xml
index ed72063db..ecdb09080 100644
--- a/kronolith/scripts/sql/kronolith.xml
+++ b/kronolith/scripts/sql/kronolith.xml
@@ -483,7 +483,6 @@
    <field>
     <name>resource_id</name>
     <type>integer</type>
-    <default></default>
     <notnull>true</notnull>
     <length>4</length>
    </field>
@@ -491,16 +490,12 @@
    <field>
     <name>resource_name</name>
     <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
     <length>255</length>
    </field>
     
    <field>
     <name>resource_calendar</name>
     <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
     <length>255</length>
    </field>
    
@@ -510,25 +505,14 @@
    </field>
    
    <field>
-    <name>resource_category</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-   
-   <field>
     <name>resource_response_type</name>
     <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
     <length>4</length>
    </field>
    
    <field>
     <name>resource_type</name>
     <type>text</type>
-    <default></default>
     <notnull>true</notnull>
     <length>255</length>
    </field>
@@ -538,6 +522,22 @@
     <type>clob</type>
    </field>
    
+   <index>
+    <name>kronolith_resources_type_idx</name>
+    <field>
+     <name>resource_type</name>
+     <sorting>ascending</sorting>
+    </field>
+   </index>
+   
+   <index>
+    <name>kronolith_resources_calendar_idx</name>
+    <field>
+     <name>resource_calendar</name>
+     <sorting>ascending</sorting>
+    </field>
+   </index>
+   
   </declaration>
   
  </table>
diff --git a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql
index a83cfcb19..ba5a2cbfc 100644
--- a/kronolith/scripts/upgrades/2009-08-17_add_resources.sql
+++ b/kronolith/scripts/upgrades/2009-08-17_add_resources.sql
@@ -5,10 +5,12 @@ CREATE TABLE kronolith_resources (
     resource_name VARCHAR(255),
     resource_calendar VARCHAR(255),
     resource_description TEXT,
-    resource_category VARCHAR(255) DEFAULT '',
-    resource_response_type INT DEFAULT 0,
+    resource_response_type INT,
     resource_type VARCHAR(255) NOT NULL,
-    resource_members BLOB,
-    
+    resource_members TEXT,
+--
     PRIMARY KEY (resource_id)
 );
+
+CREATE INDEX kronolith_resources_type_idx ON kronolith_resources (resource_type);
+CREATE INDEX kronolith_resources_calendar_idx ON kronolith_resources (resource_calendar);
\ No newline at end of file