feedbrowser_cache & linked feeds: add site url (bump schema)

4 files changed, 32 insertions, 2 deletions

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 61fcff450..9582c4687 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -254,7 +254,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (84);
+insert into ttrss_version values (85);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -404,6 +404,7 @@ create table ttrss_sessions (id varchar(250) unique not null primary key,
 
 create table ttrss_feedbrowser_cache (
 	feed_url text not null,
+	site_url text not null,
 	title text not null,
 	subscribers integer not null) DEFAULT CHARSET=UTF8;
 
@@ -437,6 +438,7 @@ create table ttrss_linked_instances (id integer not null primary key auto_increm
 
 create table ttrss_linked_feeds (
 	feed_url text not null,
+	site_url text not null,
 	title text not null,
 	created datetime not null,
 	updated datetime not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 67fe8a8d0..687426534 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -225,7 +225,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (84);
+insert into ttrss_version values (85);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -368,6 +368,7 @@ create function SUBSTRING_FOR_DATE(timestamp, int, int) RETURNS text AS 'SELECT
 create table ttrss_feedbrowser_cache (
 	feed_url text not null primary key,
 	title text not null,
+	site_url text not null,
 	subscribers integer not null);
 
 create table ttrss_labels2 (id serial not null primary key,
@@ -397,6 +398,7 @@ create table ttrss_linked_instances (id serial not null primary key,
 
 create table ttrss_linked_feeds (
 	feed_url text not null,
+	site_url text not null,
 	title text not null,
 	created timestamp not null,
 	updated timestamp not null,
diff --git a/schema/versions/mysql/85.sql b/schema/versions/mysql/85.sql
new file mode 100644
index 000000000..70cab0297
--- /dev/null
+++ b/schema/versions/mysql/85.sql
@@ -0,0 +1,13 @@
+begin;
+
+alter table ttrss_feedbrowser_cache add column site_url text;
+update ttrss_feedbrowser_cache set site_url = '';
+alter table ttrss_feedbrowser_cache change site_url site_url text not null;
+
+alter table ttrss_linked_feeds add column site_url text;
+update ttrss_linked_feeds set site_url = '';
+alter table ttrss_linked_feeds change site_url site_url text not null;
+
+update ttrss_version set schema_version = 85;
+
+commit;
diff --git a/schema/versions/pgsql/85.sql b/schema/versions/pgsql/85.sql
new file mode 100644
index 000000000..a0a782280
--- /dev/null
+++ b/schema/versions/pgsql/85.sql
@@ -0,0 +1,13 @@
+begin;
+
+alter table ttrss_feedbrowser_cache add column site_url text;
+update ttrss_feedbrowser_cache set site_url = '';
+alter table ttrss_feedbrowser_cache alter column site_url set not null;
+
+alter table ttrss_linked_feeds add column site_url text;
+update ttrss_linked_feeds set site_url = '';
+alter table ttrss_linked_feeds alter column site_url set not null;
+
+update ttrss_version set schema_version = 85;
+
+commit;