diff options
| author | Evan Prodromou <evan@status.net> | 2009-08-27 14:52:32 -0700 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-08-27 14:52:32 -0700 |
| commit | a08c76a4342cfb4b3d772f6880ba0b8f3153b246 (patch) | |
| tree | e2ba9ef2f670d01cf700a732d36050fe3ce63774 /db | |
| parent | 522008dee570aafcc844bf123d25203c7d9c3ebc (diff) | |
| parent | eb667d09d9c6ef5a1465a5f8d824661a9387a4da (diff) | |
Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
Conflicts:
classes/laconica.ini
Diffstat (limited to 'db')
| -rw-r--r-- | db/08to09.sql | 2 | ||||
| -rw-r--r-- | db/statusnet.sql | 1 | ||||
| -rw-r--r-- | db/statusnet_pg.sql | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/db/08to09.sql b/db/08to09.sql index 4d1830611..223a99fa3 100644 --- a/db/08to09.sql +++ b/db/08to09.sql @@ -10,3 +10,5 @@ alter table profile alter table user_group modify column description text comment 'group description'; +alter table file_oembed + add column mimetype varchar(50) comment 'mime type of resource'; diff --git a/db/statusnet.sql b/db/statusnet.sql index deebe72c6..221d60ce3 100644 --- a/db/statusnet.sql +++ b/db/statusnet.sql @@ -450,6 +450,7 @@ create table file_oembed ( file_id integer primary key comment 'oEmbed for that URL/file' references file (id), version varchar(20) comment 'oEmbed spec. version', type varchar(20) comment 'oEmbed type: photo, video, link, rich', + mimetype varchar(50) comment 'mime type of resource', provider varchar(50) comment 'name of this oEmbed provider', provider_url varchar(255) comment 'URL of this oEmbed provider', width integer comment 'width of oEmbed resource when available', diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql index b5626d3f4..5b4d0485a 100644 --- a/db/statusnet_pg.sql +++ b/db/statusnet_pg.sql @@ -465,6 +465,7 @@ create table file_oembed ( file_id bigint default nextval('file_oembed_seq') primary key /* comment 'unique identifier' */, version varchar(20), type varchar(20), + mimetype varchar(50), provider varchar(50), provider_url varchar(255), width integer, |