diff options
author | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
---|---|---|
committer | YoungMin Park <[email protected]> | 2014-11-04 11:49:43 +0900 |
commit | a5bbb2bec133bdee08b361628f32430ae3884107 (patch) | |
tree | b203105149ec234ebe155d5718d2cbb6390b4a45 /schema | |
parent | 12727ad17d125eb2f3f243231ccca1cb0a5a7b4b (diff) | |
parent | 2f43089de1ead3f164b8b31967d1abbb784319fa (diff) |
Merge pull request #1 from gothfox/master
Update from original
Diffstat (limited to 'schema')
-rw-r--r-- | schema/ttrss_schema_mysql.sql | 14 | ||||
-rw-r--r-- | schema/ttrss_schema_pgsql.sql | 6 | ||||
-rw-r--r-- | schema/versions/mysql/122.sql | 7 | ||||
-rw-r--r-- | schema/versions/mysql/123.sql | 9 | ||||
-rw-r--r-- | schema/versions/mysql/124.sql | 8 | ||||
-rw-r--r-- | schema/versions/mysql/125.sql | 10 | ||||
-rw-r--r-- | schema/versions/mysql/126.sql | 8 | ||||
-rw-r--r-- | schema/versions/pgsql/122.sql | 7 | ||||
-rw-r--r-- | schema/versions/pgsql/123.sql | 5 | ||||
-rw-r--r-- | schema/versions/pgsql/124.sql | 8 | ||||
-rw-r--r-- | schema/versions/pgsql/125.sql | 5 | ||||
-rw-r--r-- | schema/versions/pgsql/126.sql | 8 |
12 files changed, 88 insertions, 7 deletions
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql index 8ba57e123..a9a358220 100644 --- a/schema/ttrss_schema_mysql.sql +++ b/schema/ttrss_schema_mysql.sql @@ -44,7 +44,6 @@ create table ttrss_users (id integer primary key not null auto_increment, pwd_hash varchar(250) not null, last_login datetime default null, access_level integer not null default 0, - theme_id integer default null, email varchar(250) not null default '', full_name varchar(250) not null default '', email_digest bool not null default false, @@ -53,7 +52,7 @@ create table ttrss_users (id integer primary key not null auto_increment, created datetime default null, twitter_oauth longtext default null, otp_enabled boolean not null default false, - index (theme_id)) ENGINE=InnoDB DEFAULT CHARSET=UTF8; + resetpass_token varchar(250) default null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; insert into ttrss_users (login,pwd_hash,access_level) values ('admin', 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 10); @@ -84,7 +83,7 @@ create table ttrss_counters_cache ( value integer not null default 0, updated datetime not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE -); +) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create index ttrss_counters_cache_feed_id_idx on ttrss_counters_cache(feed_id); create index ttrss_counters_cache_owner_uid_idx on ttrss_counters_cache(owner_uid); @@ -96,7 +95,7 @@ create table ttrss_cat_counters_cache ( value integer not null default 0, updated datetime not null, foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE -); +) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create index ttrss_cat_counters_cache_owner_uid_idx on ttrss_cat_counters_cache(owner_uid); @@ -163,6 +162,7 @@ create table ttrss_entries (id integer not null primary key auto_increment, date_updated datetime not null, num_comments integer not null default 0, plugin_data longtext, + lang varchar(2), comments varchar(250) not null default '', author varchar(250) not null default '') ENGINE=InnoDB DEFAULT CHARSET=UTF8; @@ -301,7 +301,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 (121); +insert into ttrss_version values (126); create table ttrss_enclosures (id integer primary key auto_increment, content_url text not null, @@ -309,6 +309,8 @@ create table ttrss_enclosures (id integer primary key auto_increment, post_id integer not null, title text not null, duration text not null, + width integer not null default 0, + height integer not null default 0, index (post_id), foreign key (post_id) references ttrss_entries(id) ON DELETE cascade) ENGINE=InnoDB DEFAULT CHARSET=UTF8; @@ -434,7 +436,7 @@ create table ttrss_feedbrowser_cache ( feed_url text not null, site_url text not null, title text not null, - subscribers integer not null) DEFAULT CHARSET=UTF8; + subscribers integer not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8; create table ttrss_labels2 (id integer not null primary key auto_increment, owner_uid integer not null, diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql index 9d0337a07..c09f044fb 100644 --- a/schema/ttrss_schema_pgsql.sql +++ b/schema/ttrss_schema_pgsql.sql @@ -49,6 +49,7 @@ create table ttrss_users (id serial not null primary key, salt varchar(250) not null default '', twitter_oauth text default null, otp_enabled boolean not null default false, + resetpass_token varchar(250) default null, created timestamp default null); insert into ttrss_users (login,pwd_hash,access_level) values ('admin', @@ -144,6 +145,7 @@ create table ttrss_entries (id serial not null primary key, num_comments integer not null default 0, comments varchar(250) not null default '', plugin_data text, + lang varchar(2), author varchar(250) not null default ''); create index ttrss_entries_guid_index on ttrss_entries(guid); @@ -259,13 +261,15 @@ 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 (121); +insert into ttrss_version values (126); create table ttrss_enclosures (id serial not null primary key, content_url text not null, content_type varchar(250) not null, title text not null, duration text not null, + width integer not null default 0, + height integer not null default 0, post_id integer references ttrss_entries(id) ON DELETE cascade NOT NULL); create index ttrss_enclosures_post_id_idx on ttrss_enclosures(post_id); diff --git a/schema/versions/mysql/122.sql b/schema/versions/mysql/122.sql new file mode 100644 index 000000000..397b97bfc --- /dev/null +++ b/schema/versions/mysql/122.sql @@ -0,0 +1,7 @@ +begin; + +alter table ttrss_entries add column lang varchar(2); + +update ttrss_version set schema_version = 122; + +commit; diff --git a/schema/versions/mysql/123.sql b/schema/versions/mysql/123.sql new file mode 100644 index 000000000..f311d060b --- /dev/null +++ b/schema/versions/mysql/123.sql @@ -0,0 +1,9 @@ +begin; + +ALTER TABLE ttrss_counters_cache ENGINE=InnoDB DEFAULT CHARSET=UTF8; +ALTER TABLE ttrss_cat_counters_cache ENGINE=InnoDB DEFAULT CHARSET=UTF8; +ALTER TABLE ttrss_feedbrowser_cache ENGINE=InnoDB DEFAULT CHARSET=UTF8; + +update ttrss_version set schema_version = 123; + +commit; diff --git a/schema/versions/mysql/124.sql b/schema/versions/mysql/124.sql new file mode 100644 index 000000000..96ae46341 --- /dev/null +++ b/schema/versions/mysql/124.sql @@ -0,0 +1,8 @@ +begin; + +alter table ttrss_users add column resetpass_token varchar(250); +alter table ttrss_users alter column resetpass_token set default null; + +update ttrss_version set schema_version = 124; + +commit; diff --git a/schema/versions/mysql/125.sql b/schema/versions/mysql/125.sql new file mode 100644 index 000000000..9f004d963 --- /dev/null +++ b/schema/versions/mysql/125.sql @@ -0,0 +1,10 @@ +begin; + +alter table ttrss_users drop column resetpass_token; + +alter table ttrss_users add column resetpass_token varchar(250); +alter table ttrss_users alter column resetpass_token set default null; + +update ttrss_version set schema_version = 125; + +commit; diff --git a/schema/versions/mysql/126.sql b/schema/versions/mysql/126.sql new file mode 100644 index 000000000..6ff661e71 --- /dev/null +++ b/schema/versions/mysql/126.sql @@ -0,0 +1,8 @@ +begin; + +alter table ttrss_enclosures add column width integer not null default 0; +alter table ttrss_enclosures add column height integer not null default 0; + +update ttrss_version set schema_version = 126; + +commit; diff --git a/schema/versions/pgsql/122.sql b/schema/versions/pgsql/122.sql new file mode 100644 index 000000000..397b97bfc --- /dev/null +++ b/schema/versions/pgsql/122.sql @@ -0,0 +1,7 @@ +begin; + +alter table ttrss_entries add column lang varchar(2); + +update ttrss_version set schema_version = 122; + +commit; diff --git a/schema/versions/pgsql/123.sql b/schema/versions/pgsql/123.sql new file mode 100644 index 000000000..999d48bf7 --- /dev/null +++ b/schema/versions/pgsql/123.sql @@ -0,0 +1,5 @@ +begin; + +update ttrss_version set schema_version = 123; + +commit; diff --git a/schema/versions/pgsql/124.sql b/schema/versions/pgsql/124.sql new file mode 100644 index 000000000..96ae46341 --- /dev/null +++ b/schema/versions/pgsql/124.sql @@ -0,0 +1,8 @@ +begin; + +alter table ttrss_users add column resetpass_token varchar(250); +alter table ttrss_users alter column resetpass_token set default null; + +update ttrss_version set schema_version = 124; + +commit; diff --git a/schema/versions/pgsql/125.sql b/schema/versions/pgsql/125.sql new file mode 100644 index 000000000..e56e0299a --- /dev/null +++ b/schema/versions/pgsql/125.sql @@ -0,0 +1,5 @@ +begin; + +update ttrss_version set schema_version = 125; + +commit; diff --git a/schema/versions/pgsql/126.sql b/schema/versions/pgsql/126.sql new file mode 100644 index 000000000..46f391aa5 --- /dev/null +++ b/schema/versions/pgsql/126.sql @@ -0,0 +1,8 @@ +begin; + +alter table ttrss_enclosures add column height integer not null default 0; +alter table ttrss_enclosures add column width integer not null default 0; + +update ttrss_version set schema_version = 126; + +commit; |