add ttrss_feeds.mark_unread_on_update, bump schema, cleanup ttrss_prefs

2 files changed, 38 insertions, 0 deletions

diff --git a/schema/versions/mysql/83.sql b/schema/versions/mysql/83.sql
new file mode 100644
index 000000000..aa1d6c1ee
--- /dev/null
+++ b/schema/versions/mysql/83.sql
@@ -0,0 +1,19 @@
+begin;
+
+alter table ttrss_feeds add column mark_unread_on_update boolean;
+update ttrss_feeds set mark_unread_on_update = false;
+alter table ttrss_feeds change mark_unread_on_update mark_unread_on_update boolean not null;
+alter table ttrss_feeds alter column mark_unread_on_update set default false;
+
+alter table ttrss_feeds add column strip_images boolean;
+update ttrss_feeds set strip_images = false;
+alter table ttrss_feeds change strip_images strip_images boolean not null;
+alter table ttrss_feeds alter column strip_images set default false;
+
+DELETE FROM ttrss_user_prefs WHERE pref_name IN ('HIDE_FEEDLIST', 'SYNC_COUNTERS', 'ENABLE_LABELS', 'ENABLE_SEARCH_TOOLBAR', 'ENABLE_FEED_ICONS', 'ENABLE_OFFLINE_READING', 'EXTENDED_FEEDLIST', 'OPEN_LINKS_IN_NEW_WINDOW', 'ENABLE_FLASH_PLAYER', 'HEADLINES_SMART_DATE', 'MARK_UNREAD_ON_UPDATE');
+
+DELETE FROM ttrss_prefs WHERE pref_name IN ('HIDE_FEEDLIST', 'SYNC_COUNTERS', 'ENABLE_LABELS', 'ENABLE_SEARCH_TOOLBAR', 'ENABLE_FEED_ICONS', 'ENABLE_OFFLINE_READING', 'EXTENDED_FEEDLIST', 'OPEN_LINKS_IN_NEW_WINDOW', 'ENABLE_FLASH_PLAYER', 'HEADLINES_SMART_DATE', 'MARK_UNREAD_ON_UPDATE');
+
+update ttrss_version set schema_version = 83;
+
+commit;
diff --git a/schema/versions/pgsql/83.sql b/schema/versions/pgsql/83.sql
new file mode 100644
index 000000000..4ba7120c1
--- /dev/null
+++ b/schema/versions/pgsql/83.sql
@@ -0,0 +1,19 @@
+begin;
+
+alter table ttrss_feeds add column mark_unread_on_update boolean;
+update ttrss_feeds set mark_unread_on_update = false;
+alter table ttrss_feeds alter column mark_unread_on_update set not null;
+alter table ttrss_feeds alter column mark_unread_on_update set default false;
+
+alter table ttrss_feeds add column strip_images boolean;
+update ttrss_feeds set strip_images = false;
+alter table ttrss_feeds alter column strip_images set not null;
+alter table ttrss_feeds alter column strip_images set default false;
+
+DELETE FROM ttrss_user_prefs WHERE pref_name IN ('HIDE_FEEDLIST', 'SYNC_COUNTERS', 'ENABLE_LABELS', 'ENABLE_SEARCH_TOOLBAR', 'ENABLE_FEED_ICONS', 'ENABLE_OFFLINE_READING', 'EXTENDED_FEEDLIST', 'OPEN_LINKS_IN_NEW_WINDOW', 'ENABLE_FLASH_PLAYER', 'HEADLINES_SMART_DATE', 'MARK_UNREAD_ON_UPDATE');
+
+DELETE FROM ttrss_prefs WHERE pref_name IN ('HIDE_FEEDLIST', 'SYNC_COUNTERS', 'ENABLE_LABELS', 'ENABLE_SEARCH_TOOLBAR', 'ENABLE_FEED_ICONS', 'ENABLE_OFFLINE_READING', 'EXTENDED_FEEDLIST', 'OPEN_LINKS_IN_NEW_WINDOW', 'ENABLE_FLASH_PLAYER', 'HEADLINES_SMART_DATE', 'MARK_UNREAD_ON_UPDATE');
+
+update ttrss_version set schema_version = 83;
+
+commit;