added missing parts to postgres update, and the config+user_role tables to both upgrade scripts

Conflicts:

	db/08to09.sql

2 files changed, 72 insertions, 0 deletions

diff --git a/db/08to09.sql b/db/08to09.sql
new file mode 100644
index 000000000..953e0e5f4
--- /dev/null
+++ b/db/08to09.sql
@@ -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;
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 892df4a39..492b3ebb9 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -1,2 +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)
+
+);
\ No newline at end of file