summaryrefslogtreecommitdiff
path: root/schema
diff options
context:
space:
mode:
Diffstat (limited to 'schema')
-rw-r--r--schema/ttrss_schema_mysql.sql35
-rw-r--r--schema/ttrss_schema_pgsql.sql25
-rw-r--r--schema/versions/mysql/105.sql11
-rw-r--r--schema/versions/mysql/106.sql12
-rw-r--r--schema/versions/mysql/107.sql15
-rw-r--r--schema/versions/mysql/108.sql7
-rw-r--r--schema/versions/pgsql/105.sql11
-rw-r--r--schema/versions/pgsql/106.sql12
-rw-r--r--schema/versions/pgsql/107.sql15
-rw-r--r--schema/versions/pgsql/108.sql7
10 files changed, 106 insertions, 44 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index bf02e7b1e..2c7a559ca 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -13,7 +13,6 @@ drop table if exists ttrss_labels;
drop table if exists ttrss_filters2_actions;
drop table if exists ttrss_filters2_rules;
drop table if exists ttrss_filters2;
-drop table if exists ttrss_filters;
drop table if exists ttrss_filter_types;
drop table if exists ttrss_filter_actions;
drop table if exists ttrss_user_prefs;
@@ -117,6 +116,7 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
hidden bool not null default false,
include_in_digest boolean not null default true,
cache_images boolean not null default false,
+ hide_images boolean not null default false,
cache_content boolean not null default false,
auth_pass_encrypted boolean not null default false,
last_viewed datetime default null,
@@ -179,6 +179,8 @@ create table ttrss_user_entries (
last_read datetime,
score int not null default 0,
note longtext,
+ last_marked datetime,
+ last_published datetime,
unread bool not null default 1,
index (ref_id),
foreign key (ref_id) references ttrss_entries(id) ON DELETE CASCADE,
@@ -244,39 +246,18 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
insert into ttrss_filter_actions (id,name,description) values (7, 'label',
'Assign label');
-create table ttrss_filters (id integer not null primary key auto_increment,
- owner_uid integer not null,
- feed_id integer default null,
- filter_type integer not null,
- reg_exp varchar(250) not null,
- filter_param varchar(250) not null default '',
- inverse bool not null default false,
- enabled bool not null default true,
- cat_filter bool not null default false,
- cat_id integer default null,
- action_id integer not null default 1,
- action_param varchar(250) not null default '',
- index (filter_type),
- foreign key (filter_type) references ttrss_filter_types(id) ON DELETE CASCADE,
- index (owner_uid),
- foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
- index (feed_id),
- foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE,
- index (cat_id),
- foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE CASCADE,
- index (action_id),
- foreign key (action_id) references ttrss_filter_actions(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
-
create table ttrss_filters2(id integer primary key auto_increment,
owner_uid integer not null,
match_any_rule boolean not null default false,
enabled boolean not null default true,
+ inverse bool not null default false,
index(owner_uid),
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
create table ttrss_filters2_rules(id integer primary key auto_increment,
filter_id integer not null references ttrss_filters2(id) on delete cascade,
reg_exp varchar(250) not null,
+ inverse bool not null default false,
filter_type integer not null,
feed_id integer default null,
cat_id integer default null,
@@ -310,7 +291,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
-insert into ttrss_version values (104);
+insert into ttrss_version values (108);
create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null,
@@ -412,7 +393,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2, 'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Hide images in articles', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not embed images in articles', 2);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_ORDER_BY', 2, 'default', '', 1);
@@ -440,7 +421,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET', 2, '', 'Customize stylesheet', 2, 'Customize CSS stylesheet to your liking');
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'true', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index e19b8cbc6..a3c114563 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -10,7 +10,6 @@ drop table if exists ttrss_labels;
drop table if exists ttrss_filters2_rules;
drop table if exists ttrss_filters2_actions;
drop table if exists ttrss_filters2;
-drop table if exists ttrss_filters;
drop table if exists ttrss_filter_types;
drop table if exists ttrss_filter_actions;
drop table if exists ttrss_user_prefs;
@@ -79,6 +78,7 @@ create table ttrss_feeds (id serial not null primary key,
include_in_digest boolean not null default true,
rtl_content boolean not null default false,
cache_images boolean not null default false,
+ hide_images boolean not null default false,
cache_content boolean not null default false,
last_viewed timestamp default null,
last_update_started timestamp default null,
@@ -159,6 +159,8 @@ create table ttrss_user_entries (
label_cache text not null,
last_read timestamp,
score int not null default 0,
+ last_marked timestamp,
+ last_published timestamp,
note text,
unread boolean not null default true);
@@ -217,27 +219,16 @@ insert into ttrss_filter_actions (id,name,description) values (6, 'score',
insert into ttrss_filter_actions (id,name,description) values (7, 'label',
'Assign label');
-create table ttrss_filters (id serial not null primary key,
- owner_uid integer not null references ttrss_users(id) on delete cascade,
- feed_id integer references ttrss_feeds(id) on delete cascade default null,
- filter_type integer not null references ttrss_filter_types(id),
- reg_exp varchar(250) not null,
- filter_param varchar(250) not null default '',
- enabled boolean not null default true,
- inverse boolean not null default false,
- cat_filter boolean not null default false,
- cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
- action_id integer not null default 1 references ttrss_filter_actions(id) on delete cascade,
- action_param varchar(250) not null default '');
-
create table ttrss_filters2(id serial not null primary key,
owner_uid integer not null references ttrss_users(id) on delete cascade,
match_any_rule boolean not null default false,
+ inverse boolean not null default false,
enabled boolean not null default true);
create table ttrss_filters2_rules(id serial not null primary key,
filter_id integer not null references ttrss_filters2(id) on delete cascade,
reg_exp varchar(250) not null,
+ inverse boolean not null default false,
filter_type integer not null references ttrss_filter_types(id),
feed_id integer references ttrss_feeds(id) on delete cascade default null,
cat_id integer references ttrss_feed_categories(id) on delete cascade default null,
@@ -258,7 +249,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 (104);
+insert into ttrss_version values (108);
create table ttrss_enclosures (id serial not null primary key,
content_url text not null,
@@ -352,7 +343,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('VFEED_GROUP_BY_FEED', 1, 'false', 'Group headlines in virtual feeds',2, 'When this option is enabled, headlines in Special feeds and Labels are grouped by feeds');
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Hide images in articles', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('STRIP_IMAGES', 1, 'false', 'Do not embed images in articles', 2);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_DEFAULT_VIEW_ORDER_BY', 2, 'default', '', 1);
@@ -380,7 +371,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) valu
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET', 2, '', 'Customize stylesheet', 2, 'Customize CSS stylesheet to your liking');
-insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'true', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'false', 'Sort headlines by feed date',2, 'Use feed-specified date to sort headlines instead of local import date.');
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
diff --git a/schema/versions/mysql/105.sql b/schema/versions/mysql/105.sql
new file mode 100644
index 000000000..a96101784
--- /dev/null
+++ b/schema/versions/mysql/105.sql
@@ -0,0 +1,11 @@
+begin;
+
+alter table ttrss_user_entries add column last_marked datetime;
+alter table ttrss_user_entries add column last_published datetime;
+
+update ttrss_user_entries set last_published = last_read where published = true;
+update ttrss_user_entries set last_marked = last_read where marked = true;
+
+update ttrss_version set schema_version = 105;
+
+commit;
diff --git a/schema/versions/mysql/106.sql b/schema/versions/mysql/106.sql
new file mode 100644
index 000000000..b819416b9
--- /dev/null
+++ b/schema/versions/mysql/106.sql
@@ -0,0 +1,12 @@
+begin;
+
+update ttrss_prefs set short_desc = 'Do not embed images in articles' where pref_name = 'STRIP_IMAGES';
+
+alter table ttrss_feeds add column hide_images bool;
+update ttrss_feeds set hide_images = false;
+alter table ttrss_feeds change hide_images hide_images bool not null;
+alter table ttrss_feeds alter column hide_images set default false;
+
+update ttrss_version set schema_version = 106;
+
+commit;
diff --git a/schema/versions/mysql/107.sql b/schema/versions/mysql/107.sql
new file mode 100644
index 000000000..9283d40d9
--- /dev/null
+++ b/schema/versions/mysql/107.sql
@@ -0,0 +1,15 @@
+begin;
+
+alter table ttrss_filters2 add column inverse bool;
+update ttrss_filters2 set inverse = false;
+alter table ttrss_filters2 change inverse inverse bool not null;
+alter table ttrss_filters2 alter column inverse set default false;
+
+alter table ttrss_filters2_rules add column inverse bool;
+update ttrss_filters2_rules set inverse = false;
+alter table ttrss_filters2_rules change inverse inverse bool not null;
+alter table ttrss_filters2_rules alter column inverse set default false;
+
+update ttrss_version set schema_version = 107;
+
+commit;
diff --git a/schema/versions/mysql/108.sql b/schema/versions/mysql/108.sql
new file mode 100644
index 000000000..899be8bb4
--- /dev/null
+++ b/schema/versions/mysql/108.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'SORT_HEADLINES_BY_FEED_DATE';
+
+update ttrss_version set schema_version = 108;
+
+commit;
diff --git a/schema/versions/pgsql/105.sql b/schema/versions/pgsql/105.sql
new file mode 100644
index 000000000..11ef679f1
--- /dev/null
+++ b/schema/versions/pgsql/105.sql
@@ -0,0 +1,11 @@
+begin;
+
+alter table ttrss_user_entries add column last_marked timestamp;
+alter table ttrss_user_entries add column last_published timestamp;
+
+update ttrss_user_entries set last_published = last_read where published = true;
+update ttrss_user_entries set last_marked = last_read where marked = true;
+
+update ttrss_version set schema_version = 105;
+
+commit;
diff --git a/schema/versions/pgsql/106.sql b/schema/versions/pgsql/106.sql
new file mode 100644
index 000000000..6e3dee2c9
--- /dev/null
+++ b/schema/versions/pgsql/106.sql
@@ -0,0 +1,12 @@
+begin;
+
+update ttrss_prefs set short_desc = 'Do not embed images in articles' where pref_name = 'STRIP_IMAGES';
+
+alter table ttrss_feeds add column hide_images boolean;
+update ttrss_feeds set hide_images = false;
+alter table ttrss_feeds alter column hide_images set not null;
+alter table ttrss_feeds alter column hide_images set default false;
+
+update ttrss_version set schema_version = 106;
+
+commit;
diff --git a/schema/versions/pgsql/107.sql b/schema/versions/pgsql/107.sql
new file mode 100644
index 000000000..a4a537c2f
--- /dev/null
+++ b/schema/versions/pgsql/107.sql
@@ -0,0 +1,15 @@
+begin;
+
+alter table ttrss_filters2 add column inverse boolean;
+update ttrss_filters2 set inverse = false;
+alter table ttrss_filters2 alter column inverse set not null;
+alter table ttrss_filters2 alter column inverse set default false;
+
+alter table ttrss_filters2_rules add column inverse boolean;
+update ttrss_filters2_rules set inverse = false;
+alter table ttrss_filters2_rules alter column inverse set not null;
+alter table ttrss_filters2_rules alter column inverse set default false;
+
+update ttrss_version set schema_version = 107;
+
+commit;
diff --git a/schema/versions/pgsql/108.sql b/schema/versions/pgsql/108.sql
new file mode 100644
index 000000000..899be8bb4
--- /dev/null
+++ b/schema/versions/pgsql/108.sql
@@ -0,0 +1,7 @@
+begin;
+
+update ttrss_prefs set def_value = 'false' where pref_name = 'SORT_HEADLINES_BY_FEED_DATE';
+
+update ttrss_version set schema_version = 108;
+
+commit;
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-15 06:11:26 +0000