Browse code

user changed to username

Jan Janak authored on 05/03/2003 13:08:33
Showing 1 changed files
... ...
@@ -11,6 +11,7 @@
11 11
 # 2003-01-21 changed SILO table definition, by dcm
12 12
 #
13 13
 # History:
14
+# 2003-03-05: Changed user to username, user is reserved word (janakj)
14 15
 # 2003-01-26 statistics table introduced (jiri)
15 16
 # 2003-01-25: Optimized keys of some core tables (janakj)
16 17
 # 2003-01-25: USER_ID changed to user everywhere (janakj)
... ...
@@ -184,7 +185,7 @@ CREATE TABLE active_sessions (
184 185
 
185 186
 
186 187
 CREATE TABLE aliases (
187
-  user varchar(50) NOT NULL default '',
188
+  username varchar(50) NOT NULL default '',
188 189
   domain varchar(100) NOT NULL default '',
189 190
   contact varchar(255) NOT NULL default '',
190 191
   expires datetime default NULL,
... ...
@@ -192,7 +193,7 @@ CREATE TABLE aliases (
192 193
   callid varchar(255) default NULL,
193 194
   cseq int(11) default NULL,
194 195
   last_modified timestamp(14) NOT NULL,
195
-  PRIMARY KEY user (user, domain, contact)
196
+  PRIMARY KEY usr (username, domain, contact)
196 197
 ) $TABLE_TYPE;
197 198
 
198 199
 
... ...
@@ -222,11 +223,11 @@ CREATE TABLE event (
222 223
 
223 224
 
224 225
 CREATE TABLE grp (
225
-  user varchar(50) NOT NULL default '',
226
+  username varchar(50) NOT NULL default '',
226 227
   domain varchar(100) NOT NULL default '',
227 228
   grp varchar(50) NOT NULL default '',
228 229
   last_modified datetime NOT NULL default '0000-00-00 00:00:00',
229
-  PRIMARY KEY(user, domain, grp)
230
+  PRIMARY KEY(username, domain, grp)
230 231
 ) $TABLE_TYPE;
231 232
 
232 233
 
... ...
@@ -238,7 +239,7 @@ CREATE TABLE grp (
238 239
 
239 240
 
240 241
 CREATE TABLE location (
241
-  user varchar(50) NOT NULL default '',
242
+  username varchar(50) NOT NULL default '',
242 243
   domain varchar(100) NOT NULL default '',
243 244
   contact varchar(255) NOT NULL default '',
244 245
   expires datetime default NULL,
... ...
@@ -246,7 +247,7 @@ CREATE TABLE location (
246 247
   callid varchar(255) default NULL,
247 248
   cseq int(11) default NULL,
248 249
   last_modified timestamp(14) NOT NULL,
249
-  PRIMARY KEY(user, domain, contact)
250
+  PRIMARY KEY(username, domain, contact)
250 251
 ) $TABLE_TYPE;
251 252
 
252 253
 
... ...
@@ -282,7 +283,7 @@ CREATE TABLE missed_calls (
282 283
 
283 284
 CREATE TABLE pending (
284 285
   phplib_id varchar(32) NOT NULL default '',
285
-  user varchar(100) NOT NULL default '',
286
+  username varchar(100) NOT NULL default '',
286 287
   password varchar(25) NOT NULL default '',
287 288
   first_name varchar(25) NOT NULL default '',
288 289
   last_name varchar(45) NOT NULL default '',
... ...
@@ -300,8 +301,8 @@ CREATE TABLE pending (
300 301
   perms varchar(32) default NULL,
301 302
   allow_find char(1) NOT NULL default '0',
302 303
   timezone varchar(128) default NULL,
303
-  PRIMARY KEY (user, domain),
304
-  KEY user_2 (user),
304
+  PRIMARY KEY (username, domain),
305
+  KEY user_2 (username),
305 306
   UNIQUE KEY phplib_id (phplib_id)
306 307
 ) $TABLE_TYPE;
307 308
 
... ...
@@ -346,7 +347,7 @@ CREATE TABLE reserved (
346 347
 
347 348
 CREATE TABLE subscriber (
348 349
   phplib_id varchar(32) NOT NULL default '',
349
-  user varchar(100) NOT NULL default '',
350
+  username varchar(100) NOT NULL default '',
350 351
   password varchar(25) NOT NULL default '',
351 352
   first_name varchar(25) NOT NULL default '',
352 353
   last_name varchar(45) NOT NULL default '',
... ...
@@ -365,8 +366,8 @@ CREATE TABLE subscriber (
365 366
   allow_find char(1) NOT NULL default '0',
366 367
   timezone varchar(128) default NULL,
367 368
   UNIQUE KEY phplib_id (phplib_id),
368
-  PRIMARY KEY (user, domain),
369
-  KEY user_2 (user)
369
+  PRIMARY KEY (username, domain),
370
+  KEY user_2 (username)
370 371
 ) $TABLE_TYPE;
371 372
 
372 373
 # hook-table for all posssible future config values
... ...
@@ -408,11 +409,11 @@ CREATE TABLE domain (
408 409
 # Table structure for table 'uri' -- uri user parts users are allowed to use
409 410
 #
410 411
 CREATE TABLE uri (
411
-  user varchar(50) NOT NULL default '',
412
+  username varchar(50) NOT NULL default '',
412 413
   domain varchar(50) NOT NULL default '',
413 414
   uri_user varchar(50) NOT NULL default '',
414 415
   last_modified datetime NOT NULL default '0000-00-00 00:00:00',
415
-  PRIMARY KEY (user, domain, uri_user)
416
+  PRIMARY KEY (username, domain, uri_user)
416 417
 ) $TABLE_TYPE;
417 418
 
418 419
 #
... ...
@@ -475,7 +476,7 @@ CREATE TABLE server_monitoring_ul (
475 476
 # add an admin user "admin" with password==heslo, 
476 477
 # so that one can try it out on quick start
477 478
 
478
-INSERT INTO subscriber (user, password, first_name, last_name, phone, 
479
+INSERT INTO subscriber (username, password, first_name, last_name, phone, 
479 480
 	email_address, datetime_created, datetime_modified, confirmation, 
480 481
 	flag, sendnotification, greeting, ha1, domain, ha1b, phplib_id, perms ) 
481 482
 	VALUES ( 'admin', 'heslo', 'Initial', 'Admin', '123',