summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-02-04 16:56:34 +0000
committerSarven Capadisli <csarven@status.net>2010-02-04 16:56:34 +0000
commit7ebd13fa69d2a5dac8bc59799281d3d6e017eeae (patch)
tree605267bbe7c902d7a71766cdeb523bfbb266a0f9 /db
parent339eb1adadc7f3495ad31ef0a5cf20cdca47ce1f (diff)
parent9e940445f1ab1ec53f3bad14a1a94dc2064d0ee6 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'db')
-rw-r--r--db/08to09.sql31
-rw-r--r--db/rc3torc4.sql4
-rw-r--r--db/statusnet.sql4
3 files changed, 36 insertions, 3 deletions
diff --git a/db/08to09.sql b/db/08to09.sql
index b10e47dbc..d5f30a26b 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -110,3 +110,34 @@ insert into queue_item_new (frame,transport,created,claimed)
alter table queue_item rename to queue_item_old;
alter table queue_item_new rename to queue_item;
+alter table consumer
+ add column consumer_secret varchar(255) not null comment 'secret value';
+
+create table oauth_application (
+ id integer auto_increment primary key comment 'unique identifier',
+ owner integer not null comment 'owner of the application' references profile (id),
+ consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key),
+ name varchar(255) not null comment 'name of the application',
+ description varchar(255) comment 'description of the application',
+ icon varchar(255) not null comment 'application icon',
+ source_url varchar(255) comment 'application homepage - used for source link',
+ organization varchar(255) comment 'name of the organization running the application',
+ homepage varchar(255) comment 'homepage for the organization',
+ callback_url varchar(255) comment 'url to redirect to after authentication',
+ type tinyint default 0 comment 'type of app, 1 = browser, 2 = desktop',
+ access_type tinyint default 0 comment 'default access type, bit 1 = read, bit 2 = write',
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified'
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+create table oauth_application_user (
+ profile_id integer not null comment 'user of the application' references profile (id),
+ application_id integer not null comment 'id of the application' references oauth_application (id),
+ access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked',
+ token varchar(255) comment 'request or access token',
+ created datetime not null comment 'date this record was created',
+ modified timestamp comment 'date this record was modified',
+ constraint primary key (profile_id, application_id)
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+
+
diff --git a/db/rc3torc4.sql b/db/rc3torc4.sql
index 8342c4bc6..917c1f1c4 100644
--- a/db/rc3torc4.sql
+++ b/db/rc3torc4.sql
@@ -15,7 +15,9 @@ alter table queue_item rename to queue_item_old;
alter table queue_item_new rename to queue_item;
alter table consumer
- add consumer_secret varchar(255) not null comment 'secret value',
+ add consumer_secret varchar(255) not null comment 'secret value';
+
+alter table token
add verifier varchar(255) comment 'verifier string for OAuth 1.0a',
add verified_callback varchar(255) comment 'verified callback URL for OAuth 1.0a';
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 17de4fd0d..8946f4d7e 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -214,7 +214,7 @@ create table oauth_application (
id integer auto_increment primary key comment 'unique identifier',
owner integer not null comment 'owner of the application' references profile (id),
consumer_key varchar(255) not null comment 'application consumer key' references consumer (consumer_key),
- name varchar(255) not null comment 'name of the application',
+ name varchar(255) unique key comment 'name of the application',
description varchar(255) comment 'description of the application',
icon varchar(255) not null comment 'application icon',
source_url varchar(255) comment 'application homepage - used for source link',
@@ -230,7 +230,7 @@ create table oauth_application (
create table oauth_application_user (
profile_id integer not null comment 'user of the application' references profile (id),
application_id integer not null comment 'id of the application' references oauth_application (id),
- access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write, bit 3 = revoked',
+ access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write',
token varchar(255) comment 'request or access token',
created datetime not null comment 'date this record was created',
modified timestamp comment 'date this record was modified',