a variety of ccache work

4 files changed, 57 insertions, 4 deletions

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index f4d3b38a9..4d081db0f 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -18,6 +18,7 @@ drop table if exists ttrss_user_entries;
 drop table if exists ttrss_entries;
 drop table if exists ttrss_scheduled_updates;
 drop table if exists ttrss_counters_cache;
+drop table if exists ttrss_cat_counters_cache;
 drop table if exists ttrss_feeds;
 drop table if exists ttrss_feed_categories;
 drop table if exists ttrss_users;
@@ -64,7 +65,14 @@ create table ttrss_counters_cache (
 	owner_uid integer not null,
 	value integer not null default 0,
 	updated datetime not null,
-	foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
+);
+
+create table ttrss_cat_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null,
+	value integer not null default 0,
+	updated datetime not null,
 	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
 );
 
@@ -224,7 +232,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 (49);
+insert into ttrss_version values (50);
 
 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 4ea93f97a..319e64211 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -15,6 +15,7 @@ drop table ttrss_user_entries;
 drop table ttrss_entries;
 drop table ttrss_scheduled_updates;
 drop table ttrss_counters_cache;
+drop table ttrss_cat_counters_cache;
 drop table ttrss_feeds;
 drop table ttrss_feed_categories;
 drop table ttrss_users;
@@ -86,7 +87,13 @@ insert into ttrss_feeds (owner_uid, title, feed_url) values
 	(1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.spb.ru/forum/rss.php');
 
 create table ttrss_counters_cache (
-	feed_id integer not null references ttrss_feeds(id) ON DELETE CASCADE,
+	feed_id integer not null,
+	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+	updated timestamp not null,
+	value integer not null default 0);
+
+create table ttrss_cat_counters_cache (
+	feed_id integer not null,
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	updated timestamp not null,
 	value integer not null default 0);
@@ -201,7 +208,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 (49);
+insert into ttrss_version values (50);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/50.sql b/schema/versions/mysql/50.sql
new file mode 100644
index 000000000..6f49742f4
--- /dev/null
+++ b/schema/versions/mysql/50.sql
@@ -0,0 +1,19 @@
+drop table if exists ttrss_counters_cache;
+
+create table ttrss_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null,
+	value integer not null default 0,
+	updated datetime not null,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
+);
+
+create table ttrss_cat_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null,
+	value integer not null default 0,
+	updated datetime not null,
+	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
+);
+
+update ttrss_version set schema_version = 50;
diff --git a/schema/versions/pgsql/50.sql b/schema/versions/pgsql/50.sql
new file mode 100644
index 000000000..86846242c
--- /dev/null
+++ b/schema/versions/pgsql/50.sql
@@ -0,0 +1,19 @@
+begin;
+
+drop table ttrss_counters_cache;
+
+create table ttrss_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+	updated timestamp not null,
+	value integer not null default 0);
+
+create table ttrss_cat_counters_cache (
+	feed_id integer not null,
+	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+	updated timestamp not null,
+	value integer not null default 0);
+
+update ttrss_version set schema_version = 50;
+
+commit;