From de99f5005d48a668392ff4bda877854134e0d2f1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 28 Dec 2005 19:59:47 +0100 Subject: [PATCH] add parent_feed column to ttrss_feeds, create upgrade script for 1.1.1, move out old scripts to schema/obsolete --- schema/{ => obsolete}/upgrade-1.0.6-1.0.7-pgsql.sql | 0 schema/{ => obsolete}/upgrade-1.1-1.1.1-mysql.sql | 0 schema/{ => obsolete}/upgrade-1.1-1.1.1-pgsql.sql | 0 schema/ttrss_schema_mysql.sql | 5 ++++- schema/ttrss_schema_pgsql.sql | 3 ++- schema/upgrade-1.1.1-1.1.2-mysql.sql | 6 ++++++ schema/upgrade-1.1.1-1.1.2-pgsql.sql | 6 ++++++ 7 files changed, 18 insertions(+), 2 deletions(-) rename schema/{ => obsolete}/upgrade-1.0.6-1.0.7-pgsql.sql (100%) rename schema/{ => obsolete}/upgrade-1.1-1.1.1-mysql.sql (100%) rename schema/{ => obsolete}/upgrade-1.1-1.1.1-pgsql.sql (100%) create mode 100644 schema/upgrade-1.1.1-1.1.2-mysql.sql create mode 100644 schema/upgrade-1.1.1-1.1.2-pgsql.sql diff --git a/schema/upgrade-1.0.6-1.0.7-pgsql.sql b/schema/obsolete/upgrade-1.0.6-1.0.7-pgsql.sql similarity index 100% rename from schema/upgrade-1.0.6-1.0.7-pgsql.sql rename to schema/obsolete/upgrade-1.0.6-1.0.7-pgsql.sql diff --git a/schema/upgrade-1.1-1.1.1-mysql.sql b/schema/obsolete/upgrade-1.1-1.1.1-mysql.sql similarity index 100% rename from schema/upgrade-1.1-1.1.1-mysql.sql rename to schema/obsolete/upgrade-1.1-1.1.1-mysql.sql diff --git a/schema/upgrade-1.1-1.1.1-pgsql.sql b/schema/obsolete/upgrade-1.1-1.1.1-pgsql.sql similarity index 100% rename from schema/upgrade-1.1-1.1.1-pgsql.sql rename to schema/obsolete/upgrade-1.1-1.1.1-pgsql.sql diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 0fa1aa77..9d79f8a2 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -54,10 +54,13 @@ create table ttrss_feeds (id integer not null auto_increment primary key, site_url varchar(250) not null default '', auth_login varchar(250) not null default '', auth_pass varchar(250) not null default '', + parent_feed integer default null, index(owner_uid), foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE, index(cat_id), - foreign key (cat_id) references ttrss_feed_categories(id)) TYPE=InnoDB; + foreign key (cat_id) references ttrss_feed_categories(id), + index(parent_feed), + foreign key (parent_feed) references ttrss_feeds(id) ON DELETE SET NULL) TYPE=InnoDB; insert into ttrss_feeds (owner_uid,title,feed_url) values (1,'Footnotes', 'http://gnomedesktop.org/node/feed'); insert into ttrss_feeds (owner_uid,title,feed_url) values (1,'Latest Linux Kernel Versions','http://kernel.org/kdist/rss.xml'); diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 9df7418f..c2db4b36 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -49,7 +49,8 @@ create table ttrss_feeds (id serial not null primary key, last_error text not null default '', site_url varchar(250) not null default '', auth_login varchar(250) not null default '', - auth_pass varchar(250) not null default ''); + parent_feed integer default null references ttrss_feeds(id) on delete set null, + auth_pass varchar(250) not null default ''); create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid); diff --git a/schema/upgrade-1.1.1-1.1.2-mysql.sql b/schema/upgrade-1.1.1-1.1.2-mysql.sql new file mode 100644 index 00000000..9061587b --- /dev/null +++ b/schema/upgrade-1.1.1-1.1.2-mysql.sql @@ -0,0 +1,6 @@ +begin; + +alter table ttrss_feeds add column parent_feed integer; +alter table ttrss_feeds add foreign key (parent_feed) references ttrss_feeds(id) on delete set null; + +commit; diff --git a/schema/upgrade-1.1.1-1.1.2-pgsql.sql b/schema/upgrade-1.1.1-1.1.2-pgsql.sql new file mode 100644 index 00000000..9061587b --- /dev/null +++ b/schema/upgrade-1.1.1-1.1.2-pgsql.sql @@ -0,0 +1,6 @@ +begin; + +alter table ttrss_feeds add column parent_feed integer; +alter table ttrss_feeds add foreign key (parent_feed) references ttrss_feeds(id) on delete set null; + +commit; -- 2.39.2