some RDBMS have problems with keys of this length, remove them.

diff --git a/horde/scripts/sql/create.mssql.sql b/horde/scripts/sql/create.mssql.sql
index 69f5e2d..bc00f81 100644 (file)
--- a/horde/scripts/sql/create.mssql.sql
+++ b/horde/scripts/sql/create.mssql.sql
@@ -277,11 +277,10 @@ CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR(255) NOT NULL,
     device_user       VARCHAR(255) NOT NULL,
     device_ping       TEXT,
-    device_folders    TEXT,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    TEXT
 );
 GO
 
 CREATE INDEX activesync_device_users_idx ON horde_activesync_device_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);
 GO
\ No newline at end of file

diff --git a/horde/scripts/sql/create.mysql.sql b/horde/scripts/sql/create.mysql.sql
index 6812d0d..23037f4 100644 (file)
--- a/horde/scripts/sql/create.mysql.sql
+++ b/horde/scripts/sql/create.mysql.sql
@@ -296,11 +296,10 @@ CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR(255) NOT NULL,
     device_user       VARCHAR(255) NOT NULL,
     device_ping       TEXT,
-    device_folders    TEXT,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    TEXT
 );
 
 CREATE INDEX activesync_device_users_idx ON horde_activesync_device_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);
 
 -- Done.

diff --git a/horde/scripts/sql/create.oci8.sql b/horde/scripts/sql/create.oci8.sql
index cfca2ae..bd8c79b 100644 (file)
--- a/horde/scripts/sql/create.oci8.sql
+++ b/horde/scripts/sql/create.oci8.sql
@@ -321,10 +321,9 @@ CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR2(255) NOT NULL,
     device_user       VARCHAR2(255) NOT NULL,
     device_ping       CLOB,
-    device_folders    CLOB,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    CLOB
 );
 CREATE INDEX activesync_device_users_idx ON horde_activesync_device_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);
 
 exit

diff --git a/horde/scripts/sql/create.pgsql.sql b/horde/scripts/sql/create.pgsql.sql
index 229b8ca..05da0c5 100644 (file)
--- a/horde/scripts/sql/create.pgsql.sql
+++ b/horde/scripts/sql/create.pgsql.sql
@@ -256,10 +256,9 @@ CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR(255) NOT NULL,
     device_user       VARCHAR(255) NOT NULL,
     device_ping       TEXT,
-    device_folders    TEXT,
---
-    PRIMARY KEY (device_id, device_user)
-);
+    device_folders    TEXT);
+
 CREATE INDEX activesync_device_users_idx ON horde_activesync_device_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);
 
 COMMIT;

diff --git a/horde/scripts/sql/create.sql b/horde/scripts/sql/create.sql
index 012d75a..675fa53 100644 (file)
--- a/horde/scripts/sql/create.sql
+++ b/horde/scripts/sql/create.sql
@@ -263,8 +263,7 @@ CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR(255) NOT NULL,
     device_user       VARCHAR(255) NOT NULL,
     device_ping       TEXT,
-    device_folders    TEXT,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    TEXT
 );
 CREATE INDEX activesync_device_users_idx ON horde_activesync_device_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);

diff --git a/horde/scripts/sql/create.sybase.sql b/horde/scripts/sql/create.sybase.sql
index d8749ea..c56a24e 100644 (file)
--- a/horde/scripts/sql/create.sybase.sql
+++ b/horde/scripts/sql/create.sybase.sql
@@ -213,9 +213,7 @@ CREATE TABLE horde_activesync_device_users (
     device_id         varchar(255) NOT NULL,
     device_user       varchar(255) NOT NULL,
     device_ping       text,
-    device_folders    text,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    text
 );
 go
 

diff --git a/horde/scripts/sql/create.xml b/horde/scripts/sql/create.xml
index 06ae2df..3651fdd 100644 (file)
--- a/horde/scripts/sql/create.xml
+++ b/horde/scripts/sql/create.xml
@@ -1507,6 +1507,13 @@
   <name>horde_activesync_device_users</name>
 
   <declaration>
+
+   <field>
+    <name>device_id</name>
+    <type>text</type>
+    <length>255</length>
+   </field>
+
    <field>
     <name>device_ping</name>
     <type>clob</type>

diff --git a/horde/scripts/sql/horde_activesync.sql b/horde/scripts/sql/horde_activesync.sql
index ae64a7f..19e8e79 100644 (file)
--- a/horde/scripts/sql/horde_activesync.sql
+++ b/horde/scripts/sql/horde_activesync.sql
@@ -41,10 +41,9 @@ CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR(255) NOT NULL,
     device_user       VARCHAR(255) NOT NULL,
     device_ping       TEXT,
-    device_folders    TEXT,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    TEXT
 );
 
 CREATE INDEX activesync_device_user_idx ON horde_activesync_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);
 

diff --git a/horde/scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql b/horde/scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql
index 69132d3..8661ad4 100644 (file)
--- a/horde/scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql
+++ b/horde/scripts/upgrades/2010-05-11_horde_activesync_adduserkey.sql
@@ -4,17 +4,14 @@ ALTER TABLE horde_activesync_device DROP COLUMN device_user;
 ALTER TABLE horde_activesync_device DROP COLUMN device_ping;
 ALTER TABLE horde_activesync_device DROP COLUMN device_folders;
 
-DROP INDEX activesync_device_user_idx ON horde_activesync_device;
-
 CREATE TABLE horde_activesync_device_users (
     device_id         VARCHAR(255) NOT NULL,
     device_user       VARCHAR(255) NOT NULL,
     device_ping       TEXT,
-    device_folders    TEXT,
---
-    PRIMARY KEY (device_id, device_user)
+    device_folders    TEXT
 );
 CREATE INDEX activesync_device_users_idx ON horde_activesync_device_users (device_user);
+CREATE INDEX activesync_device_users_id_idx on horde_activesync_device_users (device_id);
 
 ALTER TABLE horde_activesync_map ADD COLUMN sync_user VARCHAR(255);
 CREATE INDEX activesync_map_user_idx ON horde_activesync_map (sync_user);