Merge branch 'master' into wip-new-prefs

2 files changed, 20 insertions, 0 deletions

diff --git a/schema/versions/mysql/141.sql b/schema/versions/mysql/141.sql
new file mode 100644
index 000000000..03caf23d0
--- /dev/null
+++ b/schema/versions/mysql/141.sql
@@ -0,0 +1,9 @@
+create table ttrss_user_prefs2 (
+	owner_uid integer not null,
+	pref_name varchar(250),
+	profile integer null,
+	value longtext not null,
+	foreign key (profile) references ttrss_settings_profiles(id) ON DELETE CASCADE,
+ 	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+
+update ttrss_version set schema_version = 141;
diff --git a/schema/versions/pgsql/141.sql b/schema/versions/pgsql/141.sql
new file mode 100644
index 000000000..679ca9498
--- /dev/null
+++ b/schema/versions/pgsql/141.sql
@@ -0,0 +1,11 @@
+create table ttrss_user_prefs2 (
+	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
+	pref_name varchar(250) not null,
+	profile integer references ttrss_settings_profiles(id) ON DELETE CASCADE,
+	value text not null);
+
+create index ttrss_user_prefs2_owner_uid_index on ttrss_user_prefs2(owner_uid);
+create index ttrss_user_prefs2_pref_name_idx on ttrss_user_prefs2(pref_name);
+create unique index ttrss_user_prefs2_composite_idx on ttrss_user_prefs2(pref_name, owner_uid, coalesce(profile, -1));
+
+update ttrss_version set schema_version = 141;