Merge branch 'reg_exp_length' of lllusion3418/tt-rss into master

include/functions.php

@@ -1,6 +1,6 @@
 <?php
 	define('EXPECTED_CONFIG_VERSION', 26);
-	define('SCHEMA_VERSION', 133);
+	define('SCHEMA_VERSION', 134);
 
 	define('LABEL_BASE_INDEX', -1024);
 	define('PLUGIN_FEED_BASE_INDEX', -128);

schema/ttrss_schema_mysql.sql

@@ -248,7 +248,7 @@ create table ttrss_filters2(id integer primary key auto_increment,
 
 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,
+	reg_exp text not null,
 	inverse bool not null default false,
 	filter_type integer not null,
 	feed_id integer default null,
@@ -284,7 +284,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 (133);
+insert into ttrss_version values (134);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,

schema/ttrss_schema_pgsql.sql

@@ -243,7 +243,7 @@ create table ttrss_filters2(id serial not null primary key,
 
 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,
+	reg_exp text 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,
@@ -266,7 +266,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 (133);
+insert into ttrss_version values (134);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,

schema/versions/mysql/134.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+ALTER TABLE ttrss_filters2_rules MODIFY reg_exp text not null;
+
+UPDATE ttrss_version SET schema_version = 134;
+
+COMMIT;

schema/versions/pgsql/134.sql

@@ -0,0 +1,7 @@
+BEGIN;
+
+ALTER TABLE ttrss_filters2_rules ALTER COLUMN reg_exp TYPE text;
+
+UPDATE ttrss_version SET schema_version = 134;
+
+COMMIT;