- make index name unique

- added missing index name

db/schema/acc.xml

@@ -448,13 +448,13 @@
     </column>
 
     <index>
-	<name>id_key</name>
+	<name>acc_id_key</name>
 	<unique/>
 	<colref linkend="acc.id"/>
     </index>
 
     <index role="serweb">
-	<name>cid_key</name>
+	<name>acc_cid_key</name>
 	<colref linkend="acc.sip_callid"/>
     </index>
 </table>

db/schema/credentials.xml

@@ -242,6 +242,7 @@
     </column>
 
     <index>
+	<name>cred_idx</name>
 	<colref linkend="credentials.auth_username"/>
 	<colref linkend="credentials.realm"/>
     </index>

db/schema/missed_calls.xml

@@ -442,13 +442,13 @@
     </column>
 
     <index>
-	<name>id_key</name>
+	<name>mc_id_key</name>
 	<unique/>
 	<colref linkend="mc.id"/>
     </index>
 
     <index role="serweb">
-	<name>cid_key</name>
+	<name>mc_cid_key</name>
 	<colref linkend="mc.sip_callid"/>
     </index>
 </table>

db/schema/sd_attrs.xml

@@ -44,7 +44,7 @@
 
     <index>
 	<unique/>
-	<name>userattrs_idx</name>
+	<name>sd_idx</name>
 	<colref linkend="sdattrs.id"/>
 	<colref linkend="sdattrs.name"/>
 	<colref linkend="sdattrs.value"/>

scripts/mysql/my_create.sql

@@ -59,8 +59,8 @@ CREATE TABLE acc (
     response_timestamp DATETIME NOT NULL,
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     attrs VARCHAR(255),
-    UNIQUE KEY id_key (id),
-    KEY cid_key (sip_callid)
+    UNIQUE KEY acc_id_key (id),
+    KEY acc_cid_key (sip_callid)
 );
 
 CREATE TABLE missed_calls (
@@ -89,8 +89,8 @@ CREATE TABLE missed_calls (
     response_timestamp DATETIME NOT NULL,
     flags INT UNSIGNED NOT NULL DEFAULT '0',
     attrs VARCHAR(255),
-    UNIQUE KEY id_key (id),
-    KEY cid_key (sip_callid)
+    UNIQUE KEY mc_id_key (id),
+    KEY mc_cid_key (sip_callid)
 );
 
 CREATE TABLE credentials (
@@ -101,7 +101,7 @@ CREATE TABLE credentials (
     ha1 VARCHAR(32) NOT NULL,
     ha1b VARCHAR(32) NOT NULL DEFAULT '',
     uid VARCHAR(64) NOT NULL,
-    KEY (auth_username, realm),
+    KEY cred_idx (auth_username, realm),
     KEY uid (uid)
 );
 
@@ -312,7 +312,7 @@ CREATE TABLE sd_attrs (
     value VARCHAR(255),
     type INT NOT NULL DEFAULT '0',
     flags INT UNSIGNED NOT NULL DEFAULT '0',
-    UNIQUE KEY userattrs_idx (id, name, value)
+    UNIQUE KEY sd_idx (id, name, value)
 );
 
 CREATE TABLE presentity (

scripts/oracle/or_create.sql

@@ -56,7 +56,7 @@ CREATE TABLE acc (
     response_timestamp datetime NOT NULL,
     flags int NOT NULL DEFAULT '0',
     attrs string(255),
-    id_key UNIQUE (id, ),
+    acc_id_key UNIQUE (id, ),
 
 );
 
@@ -86,7 +86,7 @@ CREATE TABLE missed_calls (
     response_timestamp datetime NOT NULL,
     flags int NOT NULL DEFAULT '0',
     attrs string(255),
-    id_key UNIQUE (id, ),
+    mc_id_key UNIQUE (id, ),
 
 );
 
@@ -299,7 +299,7 @@ CREATE TABLE sd_attrs (
     value string(255),
     type int NOT NULL DEFAULT '0',
     flags int NOT NULL DEFAULT '0',
-    userattrs_idx UNIQUE (id, name, value, )
+    sd_idx UNIQUE (id, name, value, )
 );
 
 CREATE TABLE presentity (

scripts/postgres/pg_create.sql

@@ -1,3 +1,5 @@
+CREATE USER ser PASSWORD 'heslo';
+CREATE USER serro PASSWORD '47serro11';
 CREATE TABLE version (
     table_name VARCHAR(32) NOT NULL,
     table_version INTEGER NOT NULL DEFAULT '0'
@@ -56,10 +58,10 @@ CREATE TABLE acc (
     response_timestamp TIMESTAMP NOT NULL,
     flags INTEGER NOT NULL DEFAULT '0',
     attrs VARCHAR(255),
-    CONSTRAINT id_key UNIQUE (id)
+    CONSTRAINT acc_id_key UNIQUE (id)
 );
 
-CREATE INDEX cid_key ON acc (sip_callid);
+CREATE INDEX acc_cid_key ON acc (sip_callid);
 
 CREATE TABLE missed_calls (
     id SERIAL NOT NULL,
@@ -87,10 +89,10 @@ CREATE TABLE missed_calls (
     response_timestamp TIMESTAMP NOT NULL,
     flags INTEGER NOT NULL DEFAULT '0',
     attrs VARCHAR(255),
-    CONSTRAINT id_key UNIQUE (id)
+    CONSTRAINT mc_id_key UNIQUE (id)
 );
 
-CREATE INDEX cid_key ON missed_calls (sip_callid);
+CREATE INDEX mc_cid_key ON missed_calls (sip_callid);
 
 CREATE TABLE credentials (
     auth_username VARCHAR(64) NOT NULL,
@@ -102,7 +104,7 @@ CREATE TABLE credentials (
     uid VARCHAR(64) NOT NULL
 );
 
-CREATE INDEX  ON credentials (auth_username, realm);
+CREATE INDEX cred_idx ON credentials (auth_username, realm);
 CREATE INDEX uid ON credentials (uid);
 
 CREATE TABLE attr_types (
@@ -322,7 +324,7 @@ CREATE TABLE sd_attrs (
     value VARCHAR(255),
     type INTEGER NOT NULL DEFAULT '0',
     flags INTEGER NOT NULL DEFAULT '0',
-    CONSTRAINT userattrs_idx UNIQUE (id, name, value)
+    CONSTRAINT sd_idx UNIQUE (id, name, value)
 );
 
 CREATE TABLE presentity (
@@ -546,3 +548,6 @@ CREATE TABLE customers (
     CONSTRAINT cu_idx UNIQUE (cid)
 );
 
+
+GRANT ALL ON version,acc,missed_calls,credentials,attr_types,global_attrs,domain_attrs,user_attrs,domain,location,trusted,server_monitoring,server_monitoring_agg,phonebook,gw,gw_grp,lcr,grp,silo,uri,speed_dial,sd_attrs,presentity,presentity_notes,presentity_contact,watcherinfo,tuple_notes,rls_subscription,rls_vs,rls_vs_names,i18n,pdt,customers TO ser;
+GRANT SELECT ON version,acc,missed_calls,credentials,attr_types,global_attrs,domain_attrs,user_attrs,domain,location,trusted,server_monitoring,server_monitoring_agg,phonebook,gw,gw_grp,lcr,grp,silo,uri,speed_dial,sd_attrs,presentity,presentity_notes,presentity_contact,watcherinfo,tuple_notes,rls_subscription,rls_vs,rls_vs_names,i18n,pdt,customers TO serro;

scripts/postgres/pg_drop.sql

@@ -0,0 +1,2 @@
+DROP USER ser;
+DROP USER serro;

scripts/postgres/ser_postgres.sh

@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# Script for adding and dropping ser MySQL tables
+# Script for adding and dropping SER Postgres tables
 #
 
 #################################################################