Modified primary key of pubsubSubscription.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3726 b35dd754-fafc-0310-a699-88a17e54d16e

src/database/upgrade/7/wildfire_db2.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/upgrade/7/wildfire_hsqldb.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/upgrade/7/wildfire_mysql.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   TINYINT       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  PRIMARY KEY (serviceID, nodeID, id, jid(70))
+  PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/upgrade/7/wildfire_oracle.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)    NOT NULL,
   subscriptionDepth   INTEGER        NOT NULL,
   keyword             VARCHAR2(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/upgrade/7/wildfire_postgresql.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/upgrade/7/wildfire_sqlserver.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    NVARCHAR(10)   NOT NULL,
   subscriptionDepth   INT            NOT NULL,
   keyword             NVARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/upgrade/7/wildfire_sybase.sql

@@ -75,7 +75,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    NVARCHAR(10)   NOT NULL,
   subscriptionDepth   INT            NOT NULL,
   keyword             NVARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_db2.sql

@@ -277,7 +277,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_hsqldb.sql

@@ -276,7 +276,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_mysql.sql

@@ -264,7 +264,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   TINYINT       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  PRIMARY KEY (serviceID, nodeID, id, jid(70))
+  PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_oracle.sql

@@ -270,7 +270,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)    NOT NULL,
   subscriptionDepth   INTEGER        NOT NULL,
   keyword             VARCHAR2(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_postgresql.sql

@@ -279,7 +279,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    VARCHAR(10)   NOT NULL,
   subscriptionDepth   INTEGER       NOT NULL,
   keyword             VARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_sqlserver.sql

@@ -277,7 +277,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    NVARCHAR(10)   NOT NULL,
   subscriptionDepth   INT            NOT NULL,
   keyword             NVARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (

src/database/wildfire_sybase.sql

@@ -277,7 +277,7 @@ CREATE TABLE pubsubSubscription (
   subscriptionType    NVARCHAR(10)   NOT NULL,
   subscriptionDepth   INT            NOT NULL,
   keyword             NVARCHAR(200)  NULL,
-  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id, jid)
+  CONSTRAINT pubsubSubs_pk PRIMARY KEY (serviceID, nodeID, id)
 );
 
 CREATE TABLE pubsubDefaultConf (