8 files changed, 56 insertions, 4 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 81f941127..fcff9c9bb 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -69,6 +69,7 @@ create table ttrss_feed_categories(id integer not null primary key auto_incremen
 
 create table ttrss_archived_feeds (id integer not null primary key,
 	owner_uid integer not null,
+	created datetime not null,
 	title varchar(200) not null,
 	feed_url text not null,
 	site_url varchar(250) not null default '',
@@ -132,7 +133,8 @@ create table ttrss_feeds (id integer not null auto_increment primary key,
 	feed_language varchar(100) not null default '',
 	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE,
 	foreign key (cat_id) references ttrss_feed_categories(id) ON DELETE SET NULL,
-	foreign key (parent_feed) references ttrss_feeds(id) ON DELETE SET NULL) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
+	foreign key (parent_feed) references ttrss_feeds(id) ON DELETE SET NULL,
+	unique(feed_url(255), owner_uid)) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
 insert into ttrss_feeds (owner_uid, title, feed_url) values
 	(1, 'Tiny Tiny RSS: Forum', 'http://tt-rss.org/forum/rss.php');
@@ -285,7 +287,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 (135);
+insert into ttrss_version values (138);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -378,6 +380,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLE
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_SEARCH_LANGUAGE', 2, '', 2);
 
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
 	'SORT_HEADLINES_BY_FEED_DATE',
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 3f0e012b3..ac1b38315 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -99,7 +99,8 @@ create table ttrss_feeds (id serial not null primary key,
 	pubsub_state integer not null default 0,
 	favicon_last_checked timestamp default null,
 	feed_language varchar(100) not null default '',
-	auth_pass_encrypted boolean not null default false);
+	auth_pass_encrypted boolean not null default false,
+	unique(feed_url, owner_uid));
 
 create index ttrss_feeds_owner_uid_index on ttrss_feeds(owner_uid);
 create index ttrss_feeds_cat_id_idx on ttrss_feeds(cat_id);
@@ -109,6 +110,7 @@ insert into ttrss_feeds (owner_uid, title, feed_url) values
 
 create table ttrss_archived_feeds (id integer not null primary key,
 	owner_uid integer not null references ttrss_users(id) on delete cascade,
+	created timestamp not null,
 	title varchar(200) not null,
 	feed_url text not null,
 	site_url varchar(250) not null default '');
@@ -267,7 +269,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 (135);
+insert into ttrss_version values (138);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -358,6 +360,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_ENABLE
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('_MOBILE_REVERSE_HEADLINES', 1, 'false', 1);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_CSS_THEME', 2, '', 2);
 insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('USER_LANGUAGE', 2, '', 2);
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_SEARCH_LANGUAGE', 2, '', 2);
 
 update ttrss_prefs set access_level = 1 where pref_name in ('ON_CATCHUP_SHOW_NEXT_FEED',
 	'SORT_HEADLINES_BY_FEED_DATE',
diff --git a/schema/versions/mysql/136.sql b/schema/versions/mysql/136.sql
new file mode 100644
index 000000000..05506a568
--- /dev/null
+++ b/schema/versions/mysql/136.sql
@@ -0,0 +1,9 @@
+begin;
+
+alter table ttrss_archived_feeds add column created datetime;
+update ttrss_archived_feeds set created = NOW();
+alter table ttrss_archived_feeds change created created datetime not null;
+
+update ttrss_version set schema_version = 136;
+
+commit;
diff --git a/schema/versions/mysql/137.sql b/schema/versions/mysql/137.sql
new file mode 100644
index 000000000..45e4de02f
--- /dev/null
+++ b/schema/versions/mysql/137.sql
@@ -0,0 +1,7 @@
+begin;
+
+alter table ttrss_feeds add constraint ttrss_feeds_feed_url_owner_uid_key unique (feed_url(255), owner_uid);
+
+update ttrss_version set schema_version = 137;
+
+commit;
diff --git a/schema/versions/mysql/138.sql b/schema/versions/mysql/138.sql
new file mode 100644
index 000000000..6bfc5bcd5
--- /dev/null
+++ b/schema/versions/mysql/138.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_SEARCH_LANGUAGE', 2, '', 2);
+
+update ttrss_version set schema_version = 138;
+
+commit;
diff --git a/schema/versions/pgsql/136.sql b/schema/versions/pgsql/136.sql
new file mode 100644
index 000000000..d74136537
--- /dev/null
+++ b/schema/versions/pgsql/136.sql
@@ -0,0 +1,9 @@
+begin;
+
+alter table ttrss_archived_feeds add column created timestamp;
+update ttrss_archived_feeds set created = NOW();
+alter table ttrss_archived_feeds alter column created set not null;
+
+update ttrss_version set schema_version = 136;
+
+commit;
diff --git a/schema/versions/pgsql/137.sql b/schema/versions/pgsql/137.sql
new file mode 100644
index 000000000..71b67327e
--- /dev/null
+++ b/schema/versions/pgsql/137.sql
@@ -0,0 +1,7 @@
+begin;
+
+alter table ttrss_feeds add constraint ttrss_feeds_feed_url_owner_uid_key unique (feed_url, owner_uid);
+
+update ttrss_version set schema_version = 137;
+
+commit;
diff --git a/schema/versions/pgsql/138.sql b/schema/versions/pgsql/138.sql
new file mode 100644
index 000000000..6bfc5bcd5
--- /dev/null
+++ b/schema/versions/pgsql/138.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,section_id) values('DEFAULT_SEARCH_LANGUAGE', 2, '', 2);
+
+update ttrss_version set schema_version = 138;
+
+commit;