change filter rule regexp type to text

diff --git a/include/functions.php b/include/functions.php
index d4259574450b0d5632ac27c1a943d208fba2e927..b5e2eb77665a41d4e23cb5e45c40630973eb0972 100755 (executable)
--- a/include/functions.php
+++ b/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);

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index ce299f4e0156b373bab314d17585d6d75c8c9c3d..a1b45efbbddca58a966c100dc4d5317bc7568c44 100644 (file)
--- a/schema/ttrss_schema_mysql.sql
+++ b/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,

diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 9f397535357c17e88c0b5b670abf23de28aa84a0..dead2c762d09a6f5db758f42e68a48b053c077be 100644 (file)
--- a/schema/ttrss_schema_pgsql.sql
+++ b/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,

diff --git a/schema/versions/mysql/134.sql b/schema/versions/mysql/134.sql
new file mode 100644 (file)
index 0000000..7bbd766
--- /dev/null
+++ b/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;

diff --git a/schema/versions/pgsql/134.sql b/schema/versions/pgsql/134.sql
new file mode 100644 (file)
index 0000000..036abb1
--- /dev/null
+++ b/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;