From 9ab07b4468048d20b2b826ef6595a862d5a21ffd Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 22 Jul 2009 17:52:43 +1200 Subject: Fixed "User" table - added design_id and viewdesigns --- db/laconica_pg.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index f5d35f985..55a103ee0 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -72,6 +72,8 @@ create table "user" ( autosubscribe integer default 0 /* comment 'automatically subscribe to users who subscribe to us' */, urlshorteningservice varchar(50) default 'ur1.ca' /* comment 'service to use for auto-shortening URLs' */, inboxed integer default 0 /* comment 'has an inbox been created for this user?' */, + design_id integer /* comment 'id of a design' */references design(id), + viewdesigns integer default 1 /* comment 'whether to view user-provided designs'*/, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */, modified timestamp /* comment 'date this record was modified' */ -- cgit v1.2.3-54-g00ecf From c34875421ac97be26533bd494c048256136b8c1f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 22 Jul 2009 16:46:32 +1200 Subject: added missing columns in file table --- db/laconica_pg.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index 55a103ee0..172b64cf4 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -443,7 +443,6 @@ create table group_inbox ( group_id integer not null /* comment 'group receiving the message' references user_group (id) */, notice_id integer not null /* comment 'notice received' references notice (id) */, created timestamp not null default CURRENT_TIMESTAMP /* comment 'date the notice was created' */, - primary key (group_id, notice_id) ); create index group_inbox_created_idx on group_inbox using btree(created); @@ -458,7 +457,9 @@ create table file ( size integer, title varchar(255), date integer, - protected integer + protected integer, + filename text /* comment 'if a local file, name of the file' */, + modified timestamp default CURRENT_TIMESTAMP /* comment 'date this record was modified'*/ ); create sequence file_oembed_seq; -- cgit v1.2.3-54-g00ecf From 6eaa91db1c80afa0811c0f465a18250ee63b490a Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 22 Jul 2009 21:28:47 +1200 Subject: Fixes file_oembed to march mysql schema change that happened in commit 05e51228020fecaa894523b5159bc412d48e5b19 --- db/laconica_pg.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index 172b64cf4..f0a0aef4a 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -464,8 +464,7 @@ create table file ( create sequence file_oembed_seq; create table file_oembed ( - id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */, - file_id bigint unique, + file_id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */, version varchar(20), type varchar(20), provider varchar(50), -- cgit v1.2.3-54-g00ecf From 91f3ddca55ae3ea32aeeb75c797e6c81bb9fd1a0 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 22 Jul 2009 21:33:59 +1200 Subject: fixes file_redirection table to match mysql schema change in commit 05e51228020fecaa894523b5159bc412d48e5b19 --- db/laconica_pg.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index f0a0aef4a..de4fab03e 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -480,8 +480,7 @@ create table file_oembed ( create sequence file_redirection_seq; create table file_redirection ( - id bigint default nextval('file_redirection_seq') primary key /* comment 'unique identifier' */, - url varchar(255) unique, + url varchar(255) primary key, file_id bigint, redirections integer, httpcode integer -- cgit v1.2.3-54-g00ecf From 57f53869e20a61cb8adfdbe5e607bb07c9ea685f Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 22 Jul 2009 21:39:53 +1200 Subject: more changes to file_id copied from mysql schema change in 05e51228020fecaa894523b5159bc412d48e5b19 --- db/laconica_pg.sql | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index de4fab03e..1059da3c9 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -488,8 +488,7 @@ create table file_redirection ( create sequence file_thumbnail_seq; create table file_thumbnail ( - id bigint default nextval('file_thumbnail_seq') primary key /* comment 'unique identifier' */, - file_id bigint unique, + file_id bigint primary key, url varchar(255) unique, width integer, height integer @@ -497,11 +496,10 @@ create table file_thumbnail ( create sequence file_to_post_seq; create table file_to_post ( - id bigint default nextval('file_to_post_seq') primary key /* comment 'unique identifier' */, file_id bigint, post_id bigint, - unique(file_id, post_id) + primary key (file_id, post_id) ); create table group_block ( -- cgit v1.2.3-54-g00ecf From 47b2f1e08262341664ed782f5b9ecaa4e504b40c Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 22 Jul 2009 21:46:23 +1200 Subject: moved design table earlier - needs to be before "user" becuase of the foreign key --- db/laconica_pg.sql | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql index 1059da3c9..31210fd1e 100644 --- a/db/laconica_pg.sql +++ b/db/laconica_pg.sql @@ -1,4 +1,3 @@ - /* local and remote users have profiles */ create sequence profile_seq; @@ -41,6 +40,19 @@ create table sms_carrier ( modified timestamp /* comment 'date this record was modified ' */ ); +create sequence design_seq; +create table design ( + id bigint default nextval('design_seq') /* comment 'design ID'*/, + backgroundcolor integer /* comment 'main background color'*/ , + contentcolor integer /*comment 'content area background color'*/ , + sidebarcolor integer /*comment 'sidebar background color'*/ , + textcolor integer /*comment 'text color'*/ , + linkcolor integer /*comment 'link color'*/, + backgroundimage varchar(255) /*comment 'background image, if any'*/, + disposition int default 1 /*comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'*/, + primary key (id) +); + /* local users */ create table "user" ( @@ -378,20 +390,6 @@ create table profile_block ( ); -create sequence design_seq; -create table design ( - id bigint default nextval('design_seq') /* comment 'design ID'*/, - backgroundcolor integer /* comment 'main background color'*/ , - contentcolor integer /*comment 'content area background color'*/ , - sidebarcolor integer /*comment 'sidebar background color'*/ , - textcolor integer /*comment 'text color'*/ , - linkcolor integer /*comment 'link color'*/, - backgroundimage varchar(255) /*comment 'background image, if any'*/, - disposition int default 1 /*comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'*/, - primary key (id) -); - - create sequence user_group_seq; create table user_group ( -- cgit v1.2.3-54-g00ecf