Fixes:
  - A comment in "user" began with / *.
  - Index foreign_user_user_id_idx was defined twice.  The second should
    be foreign_link_user_id_idx.  And the first no longer refers to user_id
    but rather just id.
  - A comment in foreign_link wasn't terminated.
  - A comment in foreign_subscription ended with / and not */.

Signed-off-by: Jason Riedy <[email protected]>
---
  Stumbled on these while poking at SQLite support...  BTW, the source
  could use some line-ending fixes.

 db/laconica_pg.sql |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index eb0dfc0..d2e311a 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -49,7 +49,7 @@ create table "user" (
     emailnotifysub integer default 1 /* comment 'Notify by email of 
subscriptions' */,

     emailnotifyfav integer default 1 /* comment 'Notify by email of favorites' 
*/,

     emailnotifynudge integer default 1 /* comment 'Notify by email of nudges' 
*/,

-    emailnotifymsg integer default 1 / * comment 'Notify by email of direct 
messages' */,

+    emailnotifymsg integer default 1 /* comment 'Notify by email of direct 
messages' */,

 emailmicroid integer default 1 /* comment 'whether to publish email microid' 
*/,

     language varchar(50) /* comment 'preferred language' */,

     timezone varchar(50) /* comment 'timezone' */,

@@ -280,13 +280,13 @@ create table foreign_user (
      

      primary key (id, service)

 );

-create index foreign_user_user_id_idx on foreign_user using btree(user_id);

+create index foreign_user_id_idx on foreign_user using btree(id);

 

 create table foreign_link (

      user_id int /* comment 'link to user on this system, if exists' */ 
references "user" (id),

      foreign_id int /* comment 'link' */ references foreign_user (id),

      service int not null /* comment 'foreign key to service' */ references 
foreign_service (id),

-     credentials varchar(255) /* comment 'authc credentials, typically a 
password',

+     credentials varchar(255) /* comment 'authc credentials, typically a 
password' */,

      noticesync int not null default 1 /* comment 'notice synchronisation, bit 
1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,

      friendsync int not null default 2 /* comment 'friend synchronisation, bit 
1 = sync outgoing, bit 2 = sync incoming 

      created timestamp not null /* comment 'date this record was created' */,

@@ -294,13 +294,13 @@ create table foreign_link (
 

      primary key (user_id,foreign_id,service)

 );

-create index foreign_user_user_id_idx on foreign_link using btree(user_id);

+create index foreign_link_user_id_idx on foreign_link using btree(user_id);

 

 create table foreign_subscription (

      service int not null /* comment 'service where relationship happens' */ 
references foreign_service(id) ,

      subscriber int not null /* comment 'subscriber on foreign service' */ ,

      subscribed int not null /* comment 'subscribed user' */ ,

-     created timestamp not null /* comment 'date this record was created' /,

+     created timestamp not null /* comment 'date this record was created' */,

      

      primary key (service, subscriber, subscribed)

 );

-- 
1.6.1.235.g87891


_______________________________________________
Laconica-dev mailing list
[email protected]
http://mail.laconi.ca/mailman/listinfo/laconica-dev

Reply via email to