summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-25 22:30:04 -0500
committerEvan Prodromou <evan@status.net>2010-02-25 22:30:04 -0500
commit00aba4a907839304cf5c31955c3e0b184378a90c (patch)
tree3264a0f3f92c3e112e5703f1d79217737905be0f
parent254e210763587a6244e7d69eb55aabee5d8ccfa6 (diff)
add beta5 to beta6 script
-rw-r--r--db/beta5tobeta6.sql28
-rw-r--r--db/local_group.sql17
2 files changed, 28 insertions, 17 deletions
diff --git a/db/beta5tobeta6.sql b/db/beta5tobeta6.sql
new file mode 100644
index 000000000..e9dff17ef
--- /dev/null
+++ b/db/beta5tobeta6.sql
@@ -0,0 +1,28 @@
+alter table oauth_application
+ modify column name varchar(255) not null unique key comment 'name of the application',
+ modify column access_type tinyint default 0 comment 'access type, bit 1 = read, bit 2 = write';
+
+alter table user_group
+add column uri varchar(255) unique key comment 'universal identifier',
+add column mainpage varchar(255) comment 'page for group info to link to',
+drop index nickname;
+
+create table conversation (
+ id integer auto_increment primary key comment 'unique identifier',
+ uri varchar(225) unique comment 'URI of the conversation',
+ 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 local_group (
+ group_id integer primary key comment 'group represented' references user_group (id),
+ nickname varchar(64) unique key comment 'group represented',
+
+ 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;
+
+insert into local_group (group_id, nickname, created)
+select id, nickname, created from user_group;
+
diff --git a/db/local_group.sql b/db/local_group.sql
deleted file mode 100644
index 14973e755..000000000
--- a/db/local_group.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-alter table user_group
- add uri varchar(255) unique key comment 'universal identifier',
- add mainpage varchar(255) comment 'page for group info to link to',
- drop index nickname;
-
-create table local_group (
-
- group_id integer primary key comment 'group represented' references user_group (id),
- nickname varchar(64) unique key comment 'group represented',
-
- 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;
-
-insert into local_group (group_id, nickname, created, modified)
- select id, nickname, created, modified from user_group;