[OpenSER-Devel] Field name consistency in Presence tabels

[Adrian Georgescu]

Hello,

There are two tables having fields with as far as I understand the  
same meaning but different names, which is very confusing. I have  
identified here a few:

1. active_watchers.pres_uri and watchers.p_uri

Let's call it presentity_uri in both tables

2. active_watchers. status and watchers. subs_status

Let's call it status in both tables

3. active_watchers.from_user and wathers.w_user

Let's call it watcher_username in both tables

4. active_watchers.from_domain and wathers.w_domain

Let's call it watcher_domain in both tables

My 2 cents
Adrian


mysql> describe active_watchers;
+---------------+------------------+------+-----+---------- 
+----------------+
| Field         | Type             | Null | Key | Default  |  
Extra          |
+---------------+------------------+------+-----+---------- 
+----------------+
| id            | int(10) unsigned | NO   | PRI | NULL     |  
auto_increment |
| pres_uri      | varchar(128)     | NO   | MUL |           
|                |
| to_user       | varchar(64)      | NO   |     |           
|                |
| to_domain     | varchar(64)      | NO   |     |           
|                |
| from_user     | varchar(64)      | NO   |     |           
|                |
| from_domain   | varchar(64)      | NO   |     |           
|                |
| event         | varchar(64)      | NO   |     | presence  
|                |
| event_id      | varchar(64)      | YES  |     | NULL      
|                |
| to_tag        | varchar(64)      | NO   | UNI |           
|                |
| from_tag      | varchar(64)      | NO   |     |           
|                |
| callid        | varchar(64)      | NO   |     |           
|                |
| local_cseq    | int(11)          | NO   |     |           
|                |
| remote_cseq   | int(11)          | NO   |     |           
|                |
| contact       | varchar(64)      | NO   |     |           
|                |
| record_route  | text             | YES  |     | NULL      
|                |
| expires       | int(11)          | NO   | MUL |           
|                |
| status        | int(11)          | NO   |     | 2         
|                |
| reason        | varchar(64)      | NO   |     |           
|                |
| version       | int(11)          | NO   |     | 0         
|                |
| socket_info   | varchar(64)      | NO   |     |           
|                |
| local_contact | varchar(128)     | NO   |     |           
|                |
+---------------+------------------+------+-----+---------- 
+----------------+
21 rows in set (0.01 sec)

mysql> describe watchers;
+---------------+------------------+------+-----+---------- 
+----------------+
| Field         | Type             | Null | Key | Default  |  
Extra          |
+---------------+------------------+------+-----+---------- 
+----------------+
| id            | int(10) unsigned | NO   | PRI | NULL     |  
auto_increment |
| p_uri         | varchar(128)     | NO   | MUL |           
|                |
| w_user        | varchar(64)      | NO   |     |           
|                |
| w_domain      | varchar(64)      | NO   |     |           
|                |
| event         | varchar(64)      | NO   |     | presence  
|                |
| subs_status   | int(11)          | NO   |     |           
|                |
| reason        | varchar(64)      | YES  |     | NULL      
|                |
| inserted_time | int(11)          | NO   |     |           
|                |
+---------------+------------------+------+-----+---------- 
+----------------+