update mysql schema upgrade files to use ENGINE= instead of TYPE= (closes #359)

diff --git a/schema/versions/mysql/5.sql b/schema/versions/mysql/5.sql
index e3ddb0357c4f00e24d8f49527578e7db74f86151..1d8b8537b85767a6a88740b1465f1cc70b4d9187 100644 (file)
--- 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 46d0543ff6497855a03e8098612a8731927a808d..e8fe4c7b845d2b708d0f0f601d34ec62ff0b8460 100644 (file)
--- 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 af2fb820990b6a129ba943923821be4e6b4e3742..11cd3069c88aaa879c0b8205ca45b9f6ad7a2c28 100644 (file)
--- 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 1018bcf4df41a82d7801e57832aa37642f289e8f..b7ee97ccc1b8ec9e42e8573aea8a23a7f289d774 100644 (file)
--- 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 d1af11a31ad6a3596ab83756a538be7aa4353477..6b33e6c87c7e77bd8c3460b25893b0b8d6a1943a 100644 (file)
--- 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 e5b539906395ea9bcc2a0f42aad4cd3092ad5409..26b7126e7ea3541bb4419b7666e1eb631335d9f4 100644 (file)
--- 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 75d2dadcbf976fe8f3dae5863ba8f5a2cbbbcaeb..3e42fd3fb482968e08f5b717aecfd31fe555953f 100644 (file)
--- 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 5fe530c943bcbef285c76aba6ec3f0724d9d6c6e..cc28b75744b6b11b386b8f5bdfcb0bc4d8dfa933 100644 (file)
--- 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;