Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Evan Prodromou 2009-10-19 17:00:36 -04:00
commit fe1ae3a47e
3 changed files with 78 additions and 4 deletions

34
db/08to09.sql Normal file
View File

@ -0,0 +1,34 @@
alter table notice
modify column content text comment 'update content';
alter table message
modify column content text comment 'message content';
alter table profile
modify column bio text comment 'descriptive biography';
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';
create table config (
section varchar(32) comment 'configuration section',
setting varchar(32) comment 'configuration setting',
value varchar(255) comment 'configuration value',
constraint primary key (section, setting)
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
create table user_role (
user_id integer not null comment 'user having the role' references user (id),
role varchar(32) not null comment 'string representing the role',
created datetime not null comment 'date the role was granted',
constraint primary key (user_id, role)
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

40
db/08to09_pg.sql Normal file
View File

@ -0,0 +1,40 @@
-- SQL commands to update an 0.8.x version of Laconica
-- to 0.9.x.
--these are just comments
/*
alter table notice
modify column content text comment 'update content';
alter table message
modify column content text comment 'message content';
alter table profile
modify column bio text comment 'descriptive biography';
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'*/;
create table config (
section varchar(32) /* comment 'configuration section'*/,
setting varchar(32) /* comment 'configuration setting'*/,
value varchar(255) /* comment 'configuration value'*/,
primary key (section, setting)
);
create table user_role (
user_id integer not null /* comment 'user having the role'*/ references "user" (id),
role varchar(32) not null /* comment 'string representing the role'*/,
created timestamp /* not null comment 'date the role was granted'*/,
primary key (user_id, role)
);

View File

@ -118,7 +118,7 @@ class TwitterOAuthClient extends OAuthClient
}
/**
* Calls Twitter's /stutuses/update API method
* Calls Twitter's /statuses/update API method
*
* @param string $status text of the status
* @param int $in_reply_to_status_id optional id of the status it's
@ -137,7 +137,7 @@ class TwitterOAuthClient extends OAuthClient
}
/**
* Calls Twitter's /stutuses/friends_timeline API method
* Calls Twitter's /statuses/friends_timeline API method
*
* @param int $since_id show statuses after this id
* @param int $max_id show statuses before this id
@ -167,7 +167,7 @@ class TwitterOAuthClient extends OAuthClient
}
/**
* Calls Twitter's /stutuses/friends API method
* Calls Twitter's /statuses/friends API method
*
* @param int $id id of the user whom you wish to see friends of
* @param int $user_id numerical user id
@ -197,7 +197,7 @@ class TwitterOAuthClient extends OAuthClient
}
/**
* Calls Twitter's /stutuses/friends/ids API method
* Calls Twitter's /statuses/friends/ids API method
*
* @param int $id id of the user whom you wish to see friends of
* @param int $user_id numerical user id