1 files changed, 22 insertions, 22 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index e5bb7b889..a536c3f9a 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -158,7 +158,7 @@ CREATE TABLE IF NOT EXISTS `attach` (
   `os_storage` tinyint(1) NOT NULL DEFAULT '0',
   `os_path` mediumtext NOT NULL,
   `display_path` mediumtext NOT NULL,
-  `data` longblob NOT NULL,
+  `content` longblob NOT NULL,
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `allow_cid` mediumtext NOT NULL,
@@ -398,15 +398,15 @@ CREATE TABLE IF NOT EXISTS `event` (
   `event_hash` char(255) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dtstart` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `dtend` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `summary` text NOT NULL,
   `description` text NOT NULL,
   `location` text NOT NULL,
-  `type` char(255) NOT NULL DEFAULT '',
+  `etype` char(255) NOT NULL DEFAULT '',
   `nofinish` tinyint(1) NOT NULL DEFAULT '0',
   `adjust` tinyint(1) NOT NULL DEFAULT '1',
-  `ignore` tinyint(1) NOT NULL DEFAULT '0',
+  `dismissed` tinyint(1) NOT NULL DEFAULT '0',
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
@@ -420,12 +420,12 @@ CREATE TABLE IF NOT EXISTS `event` (
   `event_vdata` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
-  KEY `type` (`type`),
-  KEY `start` (`start`),
-  KEY `finish` (`finish`),
+  KEY `etype` (`etype`),
+  KEY `dtstart` (`dtstart`),
+  KEY `dtend` (`dtend`),
   KEY `adjust` (`adjust`),
   KEY `nofinish` (`nofinish`),
-  KEY `ignore` (`ignore`),
+  KEY `dismissed` (`dismissed`),
   KEY `aid` (`aid`),
   KEY `event_hash` (`event_hash`),
   KEY `event_xchan` (`event_xchan`),
@@ -569,7 +569,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `revision` int(10) unsigned NOT NULL DEFAULT '0',
   `verb` char(255) NOT NULL DEFAULT '',
   `obj_type` char(255) NOT NULL DEFAULT '',
-  `object` text NOT NULL,
+  `obj` text NOT NULL,
   `tgt_type` char(255) NOT NULL DEFAULT '',
   `target` text NOT NULL,
   `layout_mid` char(255) NOT NULL DEFAULT '',
@@ -791,24 +791,24 @@ CREATE TABLE IF NOT EXISTS `menu_item` (
 CREATE TABLE IF NOT EXISTS `notify` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `hash` char(64) NOT NULL DEFAULT '',
-  `name` char(255) NOT NULL DEFAULT '',
+  `xname` char(255) NOT NULL DEFAULT '',
   `url` char(255) NOT NULL DEFAULT '',
   `photo` char(255) NOT NULL DEFAULT '',
-  `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `msg` mediumtext NOT NULL,
   `aid` int(11) NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL DEFAULT '0',
   `link` char(255) NOT NULL DEFAULT '',
   `parent` char(255) NOT NULL DEFAULT '',
   `seen` tinyint(1) NOT NULL DEFAULT '0',
-  `type` int(11) NOT NULL DEFAULT '0',
+  `ntype` int(11) NOT NULL DEFAULT '0',
   `verb` char(255) NOT NULL DEFAULT '',
   `otype` char(16) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`),
-  KEY `type` (`type`),
+  KEY `ntype` (`ntype`),
   KEY `seen` (`seen`),
   KEY `uid` (`uid`),
-  KEY `date` (`date`),
+  KEY `created` (`created`),
   KEY `hash` (`hash`),
   KEY `parent` (`parent`),
   KEY `link` (`link`),
@@ -893,12 +893,12 @@ CREATE TABLE IF NOT EXISTS `photo` (
   `description` text NOT NULL,
   `album` char(255) NOT NULL DEFAULT '',
   `filename` char(255) NOT NULL DEFAULT '',
-  `type` char(128) NOT NULL DEFAULT 'image/jpeg',
+  `mimetype` char(128) NOT NULL DEFAULT 'image/jpeg',
   `height` smallint(6) NOT NULL DEFAULT '0',
   `width` smallint(6) NOT NULL DEFAULT '0',
-  `size` int(10) unsigned NOT NULL DEFAULT '0',
-  `data` mediumblob NOT NULL,
-  `scale` tinyint(3) NOT NULL DEFAULT '0',
+  `filesize` int(10) unsigned NOT NULL DEFAULT '0',
+  `content` mediumblob NOT NULL,
+  `imgscale` tinyint(3) NOT NULL DEFAULT '0',
   `photo_usage` smallint(6) NOT NULL DEFAULT '0',
   `profile` tinyint(1) NOT NULL DEFAULT '0',
   `is_nsfw` tinyint(1) NOT NULL DEFAULT '0',
@@ -913,13 +913,13 @@ CREATE TABLE IF NOT EXISTS `photo` (
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `album` (`album`),
-  KEY `scale` (`scale`),
+  KEY `imgscale` (`imgscale`),
   KEY `profile` (`profile`),
   KEY `photo_flags` (`photo_flags`),
-  KEY `type` (`type`),
+  KEY `mimetype` (`mimetype`),
   KEY `aid` (`aid`),
   KEY `xchan` (`xchan`),
-  KEY `size` (`size`),
+  KEY `filesize` (`filesize`),
   KEY `resource_id` (`resource_id`),
   KEY `is_nsfw` (`is_nsfw`),
   KEY `os_storage` (`os_storage`),