From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 6 Apr 2014 13:40:16 +0000 (+0000)
Subject: bump schema version to fix resetpass_token created as a wrong type in 124
X-Git-Tag: 1.13~47
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8067dc8ca5e75a7283456b8f76c006216cc37a1d;p=tt-rss.git

bump schema version to fix resetpass_token created as a wrong type in 124
---

diff --git a/include/functions.php b/include/functions.php
index 1390d818..2455bb80 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 124);
+	define('SCHEMA_VERSION', 125);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index b38cb8f0..e11b7110 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -302,7 +302,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 (124);
+insert into ttrss_version values (125);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index f0ac4cb8..3aa65e8b 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -261,7 +261,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 (124);
+insert into ttrss_version values (125);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/125.sql b/schema/versions/mysql/125.sql
new file mode 100644
index 00000000..9f004d96
--- /dev/null
+++ b/schema/versions/mysql/125.sql
@@ -0,0 +1,10 @@
+begin;
+
+alter table ttrss_users drop column resetpass_token;
+
+alter table ttrss_users add column resetpass_token varchar(250);
+alter table ttrss_users alter column resetpass_token set default null;
+
+update ttrss_version set schema_version = 125;
+
+commit;
diff --git a/schema/versions/pgsql/125.sql b/schema/versions/pgsql/125.sql
new file mode 100644
index 00000000..e56e0299
--- /dev/null
+++ b/schema/versions/pgsql/125.sql
@@ -0,0 +1,5 @@
+begin;
+
+update ttrss_version set schema_version = 125;
+
+commit;