From: Andrew Dolgov Date: Wed, 21 Dec 2005 18:08:59 +0000 (+0100) Subject: bump schema version X-Git-Tag: schema_upgrade_passed_(1.1_->_1.1.1)~1 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=49756fc36cd7014459c8c29e83d77dd327627c01;p=tt-rss.git bump schema version --- diff --git a/backend.php b/backend.php index 264c0000..f0078888 100644 --- a/backend.php +++ b/backend.php @@ -28,7 +28,7 @@ exit; } - define('SCHEMA_VERSION', 2); + define('SCHEMA_VERSION', 3); require_once "sanity_check.php"; require_once "config.php"; diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index ad90cc43..0fa1aa77 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -166,7 +166,7 @@ create table ttrss_tags (id integer primary key auto_increment, create table ttrss_version (schema_version int not null) TYPE=InnoDB; -insert into ttrss_version values (2); +insert into ttrss_version values (3); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null) TYPE=InnoDB; diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index b2523764..9df7418f 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -150,7 +150,7 @@ create index ttrss_tags_owner_uid_index on ttrss_tags(owner_uid); create table ttrss_version (schema_version int not null); -insert into ttrss_version values (2); +insert into ttrss_version values (3); create table ttrss_prefs_types (id integer not null primary key, type_name varchar(100) not null); diff --git a/schema/upgrade-1.1-1.1.1-mysql.sql b/schema/upgrade-1.1-1.1.1-mysql.sql index 0bea5e9a..79860a29 100644 --- a/schema/upgrade-1.1-1.1.1-mysql.sql +++ b/schema/upgrade-1.1-1.1.1-mysql.sql @@ -38,4 +38,6 @@ alter table ttrss_users alter column email set default ''; insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2); +update ttrss_version set schema_version = 3; + commit; diff --git a/schema/upgrade-1.1-1.1.1-pgsql.sql b/schema/upgrade-1.1-1.1.1-pgsql.sql index e48cd90c..5b23f336 100644 --- a/schema/upgrade-1.1-1.1.1-pgsql.sql +++ b/schema/upgrade-1.1-1.1.1-pgsql.sql @@ -38,4 +38,6 @@ alter table ttrss_users alter column email set default ''; insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_SEARCH_TOOLBAR', 1, 'false', 'Enable search toolbar',2); +update ttrss_version set schema_version = 3; + commit; diff --git a/xml-import.php b/xml-import.php index 69ed53c4..b2c9d21b 100644 --- a/xml-import.php +++ b/xml-import.php @@ -5,8 +5,8 @@ require_once "functions.php"; require_once "db.php"; - define('MAX_SOURCE_SCHEMA_VERSION', 2); - define('TARGET_SCHEMA_VERSION', 2); + define('MAX_SOURCE_SCHEMA_VERSION', 3); + define('TARGET_SCHEMA_VERSION', 3); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);