Browse Source

- internationalized description of attributes
- maked index unique

Karel Kozlik 20 years ago
parent
commit
339c6a08a8

+ 20 - 12
db/schema/attr_types.xml

@@ -111,6 +111,7 @@
     <index>
     <index>
 	<name>upt_idx1</name>
 	<name>upt_idx1</name>
 	<colref linkend="at.name"/>
 	<colref linkend="at.name"/>
+	<unique/>
     </index>
     </index>
 
 
     <row><value col="at.name">uid</value>         <value col="at.type">2</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">uid</value>         <value col="at.type">2</value><value col="at.d_flags">1</value></row>
@@ -121,11 +122,18 @@
     <row><value col="at.name">fr_inv_timer</value><value col="at.type">2</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">fr_inv_timer</value><value col="at.type">2</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">flags</value>       <value col="at.type">0</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">flags</value>       <value col="at.type">0</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">gflags</value>      <value col="at.type">0</value><value col="at.d_flags">1</value></row>
     <row><value col="at.name">gflags</value>      <value col="at.type">0</value><value col="at.d_flags">1</value></row>
-
+    
+    <row><value col="at.name">digest_realm</value>
+         <value col="at.type">2</value>
+	 <value col="at.desc">digest realm</value>
+	 <value col="at.d_flags">33</value>
+	 <value col="at.prior">65536</value>
+    </row>
+    
     <row><value col="at.name">sw_fname</value>      
     <row><value col="at.name">sw_fname</value>      
          <value col="at.type">2</value>
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.rich_t">string</value>
-         <value col="at.desc">first name</value>
+         <value col="at.desc">@ff_first_name</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">2</value>
          <value col="at.flags">2</value>
          <value col="at.prior">256</value>
          <value col="at.prior">256</value>
@@ -134,7 +142,7 @@
     <row><value col="at.name">sw_lname</value>      
     <row><value col="at.name">sw_lname</value>      
          <value col="at.type">2</value>
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.rich_t">string</value>
-         <value col="at.desc">last name</value>
+         <value col="at.desc">@ff_last_name</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">2</value>
          <value col="at.flags">2</value>
          <value col="at.prior">256</value>
          <value col="at.prior">256</value>
@@ -143,7 +151,7 @@
     <row><value col="at.name">sw_email</value>      
     <row><value col="at.name">sw_email</value>      
          <value col="at.type">2</value>
          <value col="at.type">2</value>
          <value col="at.rich_t">email_adr</value>
          <value col="at.rich_t">email_adr</value>
-         <value col="at.desc">email</value>
+         <value col="at.desc">@ff_email</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">2</value>
          <value col="at.flags">2</value>
          <value col="at.prior">256</value>
          <value col="at.prior">256</value>
@@ -152,7 +160,7 @@
     <row><value col="at.name">sw_timezone</value>   
     <row><value col="at.name">sw_timezone</value>   
          <value col="at.type">2</value>
          <value col="at.type">2</value>
          <value col="at.rich_t">timezone</value>
          <value col="at.rich_t">timezone</value>
-         <value col="at.desc">timezone</value>
+         <value col="at.desc">@ff_timezone</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">2</value>
          <value col="at.flags">2</value>
          <value col="at.prior">1073807616</value>
          <value col="at.prior">1073807616</value>
@@ -161,7 +169,7 @@
     <row><value col="at.name">sw_allow_find</value>      
     <row><value col="at.name">sw_allow_find</value>      
          <value col="at.type">0</value>
          <value col="at.type">0</value>
          <value col="at.rich_t">boolean</value>
          <value col="at.rich_t">boolean</value>
-         <value col="at.desc">allow find me by other users</value>
+         <value col="at.desc">@ff_allow_lookup_for_me</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">0</value>
          <value col="at.flags">0</value>
          <value col="at.prior">256</value>
          <value col="at.prior">256</value>
@@ -170,7 +178,7 @@
     <row><value col="at.name">lang</value>      
     <row><value col="at.name">lang</value>      
          <value col="at.type">2</value>
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.rich_t">string</value>
-         <value col="at.desc">language</value>
+         <value col="at.desc">@ff_language</value>
          <value col="at.d_flags">33</value>
          <value col="at.d_flags">33</value>
          <value col="at.flags">0</value>
          <value col="at.flags">0</value>
          <value col="at.prior">1073807360</value>
          <value col="at.prior">1073807360</value>
@@ -179,7 +187,7 @@
     <row><value col="at.name">sw_show_status</value>      
     <row><value col="at.name">sw_show_status</value>      
          <value col="at.type">0</value>
          <value col="at.type">0</value>
          <value col="at.rich_t">boolean</value>
          <value col="at.rich_t">boolean</value>
-         <value col="at.desc">show whether I am online to other users</value>
+         <value col="at.desc">@ff_status_visibility</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">0</value>
          <value col="at.flags">0</value>
          <value col="at.prior">1073742080</value>
          <value col="at.prior">1073742080</value>
@@ -204,7 +212,7 @@
     <row><value col="at.name">sw_domain_default_flags</value>      
     <row><value col="at.name">sw_domain_default_flags</value>      
          <value col="at.type">0</value>
          <value col="at.type">0</value>
          <value col="at.rich_t">int</value>
          <value col="at.rich_t">int</value>
-         <value col="at.desc">default flags for domain</value>
+         <value col="at.desc">@ff_domain_def_f</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">0</value>
          <value col="at.flags">0</value>
          <value col="at.prior">1073741824</value>
          <value col="at.prior">1073741824</value>
@@ -220,7 +228,7 @@
     <row><value col="at.name">sw_phone</value>      
     <row><value col="at.name">sw_phone</value>      
          <value col="at.type">2</value>
          <value col="at.type">2</value>
          <value col="at.rich_t">string</value>
          <value col="at.rich_t">string</value>
-         <value col="at.desc">phone</value>
+         <value col="at.desc">@ff_phone</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">2</value>
          <value col="at.flags">2</value>
          <value col="at.prior">256</value>
          <value col="at.prior">256</value>
@@ -237,7 +245,7 @@
     <row><value col="at.name">sw_credential_default_flags</value>
     <row><value col="at.name">sw_credential_default_flags</value>
          <value col="at.type">0</value>
          <value col="at.type">0</value>
          <value col="at.rich_t">int</value>
          <value col="at.rich_t">int</value>
-         <value col="at.desc">default flags for credentials</value>
+         <value col="at.desc">@ff_credential_def_f</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">0</value>
          <value col="at.flags">0</value>
          <value col="at.prior">1073741824</value>
          <value col="at.prior">1073741824</value>
@@ -245,7 +253,7 @@
     <row><value col="at.name">sw_uri_default_flags</value>      
     <row><value col="at.name">sw_uri_default_flags</value>      
          <value col="at.type">0</value>
          <value col="at.type">0</value>
          <value col="at.rich_t">int</value>
          <value col="at.rich_t">int</value>
-         <value col="at.desc">default flags for uri</value>
+         <value col="at.desc">@ff_uri_def_f</value>
          <value col="at.d_flags">32</value>
          <value col="at.d_flags">32</value>
          <value col="at.flags">0</value>
          <value col="at.flags">0</value>
          <value col="at.prior">1073741824</value>
          <value col="at.prior">1073741824</value>

+ 12 - 11
scripts/dbtext/ser_db/attr_types

@@ -7,21 +7,22 @@ fr_timer:string:0:::1:0:0:0
 fr_inv_timer:string:2:::1:0:0:0
 fr_inv_timer:string:2:::1:0:0:0
 flags:string:0:::1:0:0:0
 flags:string:0:::1:0:0:0
 gflags:string:0:::1:0:0:0
 gflags:string:0:::1:0:0:0
-sw_fname:string:2::first name:32:2:256:10
-sw_lname:string:2::last name:32:2:256:20
-sw_email:email_adr:2::email:32:2:256:30
-sw_timezone:timezone:2::timezone:32:2:1073807616:60
-sw_allow_find:boolean:0::allow find me by other users:32:0:256:110
-lang:string:2::language:33:0:1073807360:50
-sw_show_status:boolean:0::show whether I am online to other users:32:0:1073742080:100
+digest_realm:string:2::digest realm:33:0:65536:0
+sw_fname:string:2::@ff_first_name:32:2:256:10
+sw_lname:string:2::@ff_last_name:32:2:256:20
+sw_email:email_adr:2::@ff_email:32:2:256:30
+sw_timezone:timezone:2::@ff_timezone:32:2:1073807616:60
+sw_allow_find:boolean:0::@ff_allow_lookup_for_me:32:0:256:110
+lang:string:2::@ff_language:33:0:1073807360:50
+sw_show_status:boolean:0::@ff_status_visibility:32:0:1073742080:100
 sw_admin:string:2::admin of domain:32:1:0:0
 sw_admin:string:2::admin of domain:32:1:0:0
 sw_owner:string:2::owner of domain:32:0:0:0
 sw_owner:string:2::owner of domain:32:0:0:0
-sw_domain_default_flags:int:0::default flags for domain:32:0:1073741824:0
+sw_domain_default_flags:int:0::@ff_domain_def_f:32:0:1073741824:0
 sw_deleted_ts:int:0::deleted timestamp:32:0:0:0
 sw_deleted_ts:int:0::deleted timestamp:32:0:0:0
-sw_phone:string:2::phone:32:2:256:40
+sw_phone:string:2::@ff_phone:32:2:256:40
 sw_acl_control:string:2::acl control:32:1:0:0
 sw_acl_control:string:2::acl control:32:1:0:0
-sw_credential_default_flags:int:0::default flags for credentials:32:0:1073741824:0
-sw_uri_default_flags:int:0::default flags for uri:32:0:1073741824:0
+sw_credential_default_flags:int:0::@ff_credential_def_f:32:0:1073741824:0
+sw_uri_default_flags:int:0::@ff_uri_def_f:32:0:1073741824:0
 sw_is_admin:boolean:0::admin privilege:32:0:0:0
 sw_is_admin:boolean:0::admin privilege:32:0:0:0
 sw_is_hostmaster:boolean:0::hostmaster privilege:32:0:0:0
 sw_is_hostmaster:boolean:0::hostmaster privilege:32:0:0:0
 sw_confirmation:string:2::registration confirmation:32:0:0:0
 sw_confirmation:string:2::registration confirmation:32:0:0:0

+ 13 - 12
scripts/mysql/my_create.sql

@@ -115,7 +115,7 @@ CREATE TABLE attr_types (
     flags INT NOT NULL DEFAULT '0',
     flags INT NOT NULL DEFAULT '0',
     priority INT NOT NULL DEFAULT '0',
     priority INT NOT NULL DEFAULT '0',
     ordering INT NOT NULL DEFAULT '0',
     ordering INT NOT NULL DEFAULT '0',
-    KEY upt_idx1 (name)
+    UNIQUE KEY upt_idx1 (name)
 );
 );
 
 
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
@@ -126,21 +126,22 @@ INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_timer', '0',
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', 'first name', '32', '2', '256', '10');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', 'last name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', 'email', '32', '2', '256', '30');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', 'timezone', '32', '2', '1073807616', '60');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', 'allow find me by other users', '32', '0', '256', '110');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'string', 'language', '33', '0', '1073807360', '50');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', 'show whether I am online to other users', '32', '0', '1073742080', '100');
+INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'string', '@ff_language', '33', '0', '1073807360', '50');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', '@ff_status_visibility', '32', '0', '1073742080', '100');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_admin', '2', 'string', 'admin of domain', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_admin', '2', 'string', 'admin of domain', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', 'default flags for domain', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', '@ff_domain_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', 'phone', '32', '2', '256', '40');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', 'default flags for credentials', '32', '0', '1073741824');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', 'default flags for uri', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', '@ff_credential_def_f', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', '@ff_uri_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_admin', '0', 'boolean', 'admin privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_admin', '0', 'boolean', 'admin privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');

+ 14 - 12
scripts/oracle/or_create.sql

@@ -109,7 +109,8 @@ CREATE TABLE attr_types (
     default_flags int NOT NULL DEFAULT '0',
     default_flags int NOT NULL DEFAULT '0',
     flags int NOT NULL DEFAULT '0',
     flags int NOT NULL DEFAULT '0',
     priority int NOT NULL DEFAULT '0',
     priority int NOT NULL DEFAULT '0',
-    ordering int NOT NULL DEFAULT '0'
+    ordering int NOT NULL DEFAULT '0',
+    upt_idx1 UNIQUE (name, )
 );
 );
 
 
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
@@ -120,21 +121,22 @@ INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_timer', '0',
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', 'first name', '32', '2', '256', '10');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', 'last name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', 'email', '32', '2', '256', '30');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', 'timezone', '32', '2', '1073807616', '60');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', 'allow find me by other users', '32', '0', '256', '110');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'string', 'language', '33', '0', '1073807360', '50');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', 'show whether I am online to other users', '32', '0', '1073742080', '100');
+INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'string', '@ff_language', '33', '0', '1073807360', '50');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', '@ff_status_visibility', '32', '0', '1073742080', '100');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_admin', '2', 'string', 'admin of domain', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_admin', '2', 'string', 'admin of domain', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', 'default flags for domain', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', '@ff_domain_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', 'phone', '32', '2', '256', '40');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', 'default flags for credentials', '32', '0', '1073741824');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', 'default flags for uri', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', '@ff_credential_def_f', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', '@ff_uri_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_admin', '0', 'boolean', 'admin privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_admin', '0', 'boolean', 'admin privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');

+ 14 - 14
scripts/postgres/pg_create.sql

@@ -114,11 +114,10 @@ CREATE TABLE attr_types (
     default_flags INTEGER NOT NULL DEFAULT '0',
     default_flags INTEGER NOT NULL DEFAULT '0',
     flags INTEGER NOT NULL DEFAULT '0',
     flags INTEGER NOT NULL DEFAULT '0',
     priority INTEGER NOT NULL DEFAULT '0',
     priority INTEGER NOT NULL DEFAULT '0',
-    ordering INTEGER NOT NULL DEFAULT '0'
+    ordering INTEGER NOT NULL DEFAULT '0',
+    CONSTRAINT upt_idx1 UNIQUE (name)
 );
 );
 
 
-CREATE INDEX upt_idx1 ON attr_types (name);
-
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('uid', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('did', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('did', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('digest_realm', '2', '33');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('digest_realm', '2', '33');
@@ -127,21 +126,22 @@ INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_timer', '0',
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('fr_inv_timer', '2', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('flags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
 INSERT INTO attr_types (name, raw_type, default_flags) VALUES ('gflags', '0', '1');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', 'first name', '32', '2', '256', '10');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', 'last name', '32', '2', '256', '20');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', 'email', '32', '2', '256', '30');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', 'timezone', '32', '2', '1073807616', '60');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', 'allow find me by other users', '32', '0', '256', '110');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'string', 'language', '33', '0', '1073807360', '50');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', 'show whether I am online to other users', '32', '0', '1073742080', '100');
+INSERT INTO attr_types (name, raw_type, description, default_flags, priority) VALUES ('digest_realm', '2', 'digest realm', '33', '65536');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_fname', '2', 'string', '@ff_first_name', '32', '2', '256', '10');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_lname', '2', 'string', '@ff_last_name', '32', '2', '256', '20');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_email', '2', 'email_adr', '@ff_email', '32', '2', '256', '30');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_timezone', '2', 'timezone', '@ff_timezone', '32', '2', '1073807616', '60');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_allow_find', '0', 'boolean', '@ff_allow_lookup_for_me', '32', '0', '256', '110');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('lang', '2', 'string', '@ff_language', '33', '0', '1073807360', '50');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_show_status', '0', 'boolean', '@ff_status_visibility', '32', '0', '1073742080', '100');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_admin', '2', 'string', 'admin of domain', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_admin', '2', 'string', 'admin of domain', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_owner', '2', 'string', 'owner of domain', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', 'default flags for domain', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_domain_default_flags', '0', 'int', '@ff_domain_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_deleted_ts', '0', 'int', 'deleted timestamp', '32', '0', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', 'phone', '32', '2', '256', '40');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_phone', '2', 'string', '@ff_phone', '32', '2', '256', '40');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_acl_control', '2', 'string', 'acl control', '32', '1', '0');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', 'default flags for credentials', '32', '0', '1073741824');
-INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', 'default flags for uri', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_credential_default_flags', '0', 'int', '@ff_credential_def_f', '32', '0', '1073741824');
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_uri_default_flags', '0', 'int', '@ff_uri_def_f', '32', '0', '1073741824');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_admin', '0', 'boolean', 'admin privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_admin', '0', 'boolean', 'admin privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_is_hostmaster', '0', 'boolean', 'hostmaster privilege', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_confirmation', '2', 'string', 'registration confirmation', '32', '0', '0');