From e04c18a2c29d10184417d853391ae1d2708d4f4f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 28 Dec 2009 17:23:01 +0300 Subject: implement archived articles feed; bump schema --- schema/ttrss_schema_mysql.sql | 7 +++++-- schema/ttrss_schema_pgsql.sql | 5 +++-- schema/versions/mysql/60.sql | 12 ++++++++++++ schema/versions/pgsql/60.sql | 12 ++++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 schema/versions/mysql/60.sql create mode 100644 schema/versions/pgsql/60.sql (limited to 'schema') diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 95edaffdd..c6de60287 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -133,7 +133,8 @@ create index ttrss_entries_date_entered_index on ttrss_entries(date_entered); create table ttrss_user_entries ( int_id integer not null primary key auto_increment, ref_id integer not null, - feed_id int not null, + feed_id int, + orig_feed_id int, owner_uid integer not null, marked bool not null default 0, published bool not null default 0, @@ -145,6 +146,8 @@ create table ttrss_user_entries ( foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE, index (feed_id), foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE, + index (orig_feed_id), + foreign key (orig_feed_id) references ttrss_feeds(id) ON DELETE SET NULL, index (owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB; @@ -226,7 +229,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (59); +insert into ttrss_version values (60); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 0b6f719e1..7afebb5d9 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -121,7 +121,8 @@ create index ttrss_entries_date_entered_index on ttrss_entries(date_entered); create table ttrss_user_entries ( int_id serial not null primary key, ref_id integer not null references ttrss_entries(id) ON DELETE CASCADE, - feed_id int references ttrss_feeds(id) ON DELETE CASCADE not null, + feed_id int references ttrss_feeds(id) ON DELETE CASCADE, + orig_feed_id int references ttrss_feeds(id) ON DELETE SET NULL, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, marked boolean not null default false, published boolean not null default false, @@ -202,7 +203,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (59); +insert into ttrss_version values (60); create table ttrss_enclosures (id serial not null primary key, content_url text not null, diff --git a/schema/versions/mysql/60.sql b/schema/versions/mysql/60.sql new file mode 100644 index 000000000..a2c023354 --- /dev/null +++ b/schema/versions/mysql/60.sql @@ -0,0 +1,12 @@ +begin; + +alter table ttrss_user_entries change feed_id feed_id integer null; + +alter table ttrss_user_entries add column orig_feed_id integer; +update ttrss_user_entries set orig_feed_id = NULL; + +alter table ttrss_user_entries add constraint FOREIGN KEY (orig_feed_id) REFERENCES ttrss_feeds(id) ON DELETE SET NULL; + +update ttrss_version set schema_version = 60; + +commit; diff --git a/schema/versions/pgsql/60.sql b/schema/versions/pgsql/60.sql new file mode 100644 index 000000000..39a2e202b --- /dev/null +++ b/schema/versions/pgsql/60.sql @@ -0,0 +1,12 @@ +begin; + +alter table ttrss_user_entries alter column feed_id drop not null; + +alter table ttrss_user_entries add column orig_feed_id integer; +update ttrss_user_entries set orig_feed_id = NULL; + +alter table ttrss_user_entries add constraint "$4" FOREIGN KEY (orig_feed_id) REFERENCES ttrss_feeds(id) ON DELETE SET NULL; + +update ttrss_version set schema_version = 60; + +commit; -- cgit v1.2.3-54-g00ecf