From 1aea205cc1defa6b2948e40afa7839136ef94d4f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 1 Aug 2011 12:57:38 +0400 Subject: [PATCH] update mysql schema upgrade files to use ENGINE= instead of TYPE= (closes #359) --- schema/versions/mysql/5.sql | 2 +- schema/versions/mysql/51.sql | 4 ++-- schema/versions/mysql/56.sql | 2 +- schema/versions/mysql/6.sql | 2 +- schema/versions/mysql/60.sql | 2 +- schema/versions/mysql/63.sql | 2 +- schema/versions/mysql/69.sql | 2 +- schema/versions/mysql/84.sql | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/schema/versions/mysql/5.sql b/schema/versions/mysql/5.sql index e3ddb0357..1d8b8537b 100644 --- a/schema/versions/mysql/5.sql +++ b/schema/versions/mysql/5.sql @@ -5,7 +5,7 @@ create table ttrss_scheduled_updates (id integer not null primary key auto_incre feed_id integer default null, entered datetime not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE, - foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE) TYPE=InnoDB; + foreign key (feed_id) references ttrss_feeds(id) ON DELETE CASCADE) ENGINE=InnoDB; update ttrss_version set schema_version = 5; diff --git a/schema/versions/mysql/51.sql b/schema/versions/mysql/51.sql index 46d0543ff..e8fe4c7b8 100644 --- a/schema/versions/mysql/51.sql +++ b/schema/versions/mysql/51.sql @@ -2,13 +2,13 @@ create table ttrss_labels2 (id integer not null primary key auto_increment, owner_uid integer not null, caption varchar(250) not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; create table ttrss_user_labels2 (label_id integer not null, article_id integer not null, foreign key (label_id) references ttrss_labels2(id) ON DELETE CASCADE, foreign key (article_id) references ttrss_entries(id) ON DELETE CASCADE -) TYPE=InnoDB; +) ENGINE=InnoDB; insert into ttrss_filter_actions (id,name,description) values (7, 'label', 'Assign label'); diff --git a/schema/versions/mysql/56.sql b/schema/versions/mysql/56.sql index af2fb8209..11cd3069c 100644 --- a/schema/versions/mysql/56.sql +++ b/schema/versions/mysql/56.sql @@ -9,7 +9,7 @@ create table ttrss_enclosures (id serial not null primary key, title text not null, duration text not null, index (post_id), - foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) TYPE=InnoDB; + foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) ENGINE=InnoDB; update ttrss_version set schema_version = 56; diff --git a/schema/versions/mysql/6.sql b/schema/versions/mysql/6.sql index 1018bcf4d..b7ee97ccc 100644 --- a/schema/versions/mysql/6.sql +++ b/schema/versions/mysql/6.sql @@ -10,7 +10,7 @@ create table ttrss_sessions (id varchar(250) not null primary key, expire integer not null, ip_address varchar(15) not null default '', index (id), - index (expire)) TYPE=InnoDB; + index (expire)) ENGINE=InnoDB; delete from ttrss_prefs where pref_name = 'ENABLE_SPLASH'; diff --git a/schema/versions/mysql/60.sql b/schema/versions/mysql/60.sql index d1af11a31..6b33e6c87 100644 --- a/schema/versions/mysql/60.sql +++ b/schema/versions/mysql/60.sql @@ -8,7 +8,7 @@ create table ttrss_archived_feeds (id integer not null primary key, feed_url text not null, site_url varchar(250) not null default '', index(owner_uid), - foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB; + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB; alter table ttrss_user_entries add column orig_feed_id integer; update ttrss_user_entries set orig_feed_id = NULL; diff --git a/schema/versions/mysql/63.sql b/schema/versions/mysql/63.sql index e5b539906..26b7126e7 100644 --- a/schema/versions/mysql/63.sql +++ b/schema/versions/mysql/63.sql @@ -4,7 +4,7 @@ create table ttrss_settings_profiles(id integer primary key auto_increment, title varchar(250) not null, owner_uid integer not null, index (owner_uid), - foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB; + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB; alter table ttrss_user_prefs add column profile integer; update ttrss_user_prefs set profile = NULL; diff --git a/schema/versions/mysql/69.sql b/schema/versions/mysql/69.sql index 75d2dadcb..3e42fd3fb 100644 --- a/schema/versions/mysql/69.sql +++ b/schema/versions/mysql/69.sql @@ -5,7 +5,7 @@ create table ttrss_access_keys (id serial not null primary key, feed_id varchar(250) not null, is_cat bool not null default false, owner_uid integer not null, - foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; + foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; update ttrss_version set schema_version = 69; diff --git a/schema/versions/mysql/84.sql b/schema/versions/mysql/84.sql index 5fe530c94..cc28b7574 100644 --- a/schema/versions/mysql/84.sql +++ b/schema/versions/mysql/84.sql @@ -5,7 +5,7 @@ create table ttrss_linked_instances (id integer not null primary key auto_increm last_status_in integer not null, last_status_out integer not null, access_key varchar(250) not null unique, - access_url text not null) TYPE=InnoDB DEFAULT CHARSET=UTF8; + access_url text not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_linked_feeds ( feed_url text not null, @@ -14,7 +14,7 @@ create table ttrss_linked_feeds ( updated datetime not null, instance_id integer not null, subscribers integer not null, - foreign key (instance_id) references ttrss_linked_instances(id) ON DELETE CASCADE) TYPE=InnoDB DEFAULT CHARSET=UTF8; + foreign key (instance_id) references ttrss_linked_instances(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8; drop table ttrss_scheduled_updates;