3 commits - plugins/calendar

[Aleksander Machniak]

 plugins/calendar/drivers/database/SQL/mysql.initial.sql    |    2 +-
 plugins/calendar/drivers/database/SQL/postgres.initial.sql |    2 +-
 plugins/calendar/drivers/database/SQL/sqlite.initial.sql   |    2 +-
 plugins/calendar/drivers/kolab/SQL/mysql.initial.sql       |    2 +-
 plugins/calendar/drivers/kolab/SQL/postgres.initial.sql    |    8 +++++---
 5 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit d2d831b775becdec41f651a2b30752516ce59975
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri May 9 08:55:27 2014 +0200

    Improve indexes in postgres.initial.sql

diff --git a/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql b/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql
index 07a492b..11dff41 100644
--- a/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql
+++ b/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql
@@ -14,6 +14,8 @@ CREATE TABLE IF NOT EXISTS kolab_alarms (
   PRIMARY KEY(alarm_id)
 );
 
+CREATE INDEX kolab_alarms_user_id_idx ON kolab_alarms (user_id);
+
 CREATE TABLE IF NOT EXISTS itipinvitations (
   token character varying(64) NOT NULL,
   event_uid character varying(255) NOT NULL,
@@ -25,6 +27,6 @@ CREATE TABLE IF NOT EXISTS itipinvitations (
   PRIMARY KEY(token)
 );
 
-CREATE INDEX itipinvitations_event_uid_user_id_idx ON itipinvitations (event_uid, user_id);
+CREATE INDEX itipinvitations_user_id_event_uid_idx ON itipinvitations (user_id, event_uid);
 
 INSERT INTO system (name, value) VALUES ('calendar-kolab-version', '2014041700');


commit 4760c469685e40d04c0f81c4dba06dd6cc113c9e
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri May 9 08:53:00 2014 +0200

    Update version numbers in initial.sql files

diff --git a/plugins/calendar/drivers/database/SQL/mysql.initial.sql b/plugins/calendar/drivers/database/SQL/mysql.initial.sql
index ed989be..8d4eeb0 100644
--- a/plugins/calendar/drivers/database/SQL/mysql.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/mysql.initial.sql
@@ -80,4 +80,4 @@ CREATE TABLE IF NOT EXISTS `itipinvitations` (
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
-REPLACE INTO system (name, value) VALUES ('calendar-database-version', '2013051600');
+REPLACE INTO system (name, value) VALUES ('calendar-database-version', '2014040900');
diff --git a/plugins/calendar/drivers/database/SQL/postgres.initial.sql b/plugins/calendar/drivers/database/SQL/postgres.initial.sql
index 21239c6..27223cb 100644
--- a/plugins/calendar/drivers/database/SQL/postgres.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/postgres.initial.sql
@@ -104,4 +104,4 @@ CREATE TABLE itipinvitations (
 
 CREATE INDEX itipinvitations_user_id_event_uid_idx ON itipinvitations (user_id, event_uid);
 
-INSERT INTO system (name, value) VALUES ('calendar-database-version', '2013051600');
+INSERT INTO system (name, value) VALUES ('calendar-database-version', '2014040900');
diff --git a/plugins/calendar/drivers/database/SQL/sqlite.initial.sql b/plugins/calendar/drivers/database/SQL/sqlite.initial.sql
index 078007d..ad02f90 100644
--- a/plugins/calendar/drivers/database/SQL/sqlite.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/sqlite.initial.sql
@@ -74,4 +74,4 @@ CREATE TABLE itipinvitations (
 
 CREATE INDEX ix_itipinvitations_uid ON itipinvitations(user_id, event_uid);
 
-INSERT INTO system (name, value) VALUES ('calendar-database-version', '2013051600');
+INSERT INTO system (name, value) VALUES ('calendar-database-version', '2014040900');


commit 6123e40040943cf29eb124a67be9d1aba93a7da8
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri May 9 08:44:59 2014 +0200

    Fix version numbers in initial.sql files, fix event_id -> alarm_id in postgres.initial.sql

diff --git a/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql b/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
index 88df960..de33926 100644
--- a/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
+++ b/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql
@@ -29,4 +29,4 @@ CREATE TABLE IF NOT EXISTS `itipinvitations` (
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
-REPLACE INTO system (name, value) VALUES ('calendar-kolab-version', '2013011000');
+REPLACE INTO system (name, value) VALUES ('calendar-kolab-version', '2014041700');
diff --git a/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql b/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql
index e3ef9aa..07a492b 100644
--- a/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql
+++ b/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS kolab_alarms (
         REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
   notifyat timestamp without time zone DEFAULT NULL,
   dismissed smallint NOT NULL DEFAULT 0,
-  PRIMARY KEY(event_id)
+  PRIMARY KEY(alarm_id)
 );
 
 CREATE TABLE IF NOT EXISTS itipinvitations (
@@ -27,4 +27,4 @@ CREATE TABLE IF NOT EXISTS itipinvitations (
 
 CREATE INDEX itipinvitations_event_uid_user_id_idx ON itipinvitations (event_uid, user_id);
 
-INSERT INTO system (name, value) VALUES ('calendar-kolab-version', '2013011000');
+INSERT INTO system (name, value) VALUES ('calendar-kolab-version', '2014041700');