add parent_feed column to ttrss_feeds, create upgrade script for 1.1.1, move out old scripts to schema/obsolete

7 files changed, 18 insertions, 2 deletions

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
index 7f0cfaacf..7f0cfaacf 100644
--- a/schema/upgrade-1.0.6-1.0.7-pgsql.sql
+++ b/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
index 79860a29c..79860a29c 100644
--- a/schema/upgrade-1.1-1.1.1-mysql.sql
+++ b/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
index 5b23f3366..5b23f3366 100644
--- a/schema/upgrade-1.1-1.1.1-pgsql.sql
+++ b/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 0fa1aa77a..9d79f8a25 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 9df7418fa..c2db4b36c 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 000000000..9061587b3
--- /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 000000000..9061587b3
--- /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;