From 1a42580ad44f768ba8d4eb0669f3b8be03670e04 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 22 Dec 2013 18:37:39 -0800 Subject: remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code. --- install/database.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'install/database.sql') diff --git a/install/database.sql b/install/database.sql index 915cecdba..f73460937 100644 --- a/install/database.sql +++ b/install/database.sql @@ -240,7 +240,7 @@ CREATE TABLE IF NOT EXISTS `event` ( `start` datetime NOT NULL, `finish` datetime NOT NULL, `summary` text NOT NULL, - `desc` text NOT NULL, + `description` text NOT NULL, `location` text NOT NULL, `type` char(255) NOT NULL, `nofinish` tinyint(1) NOT NULL DEFAULT '0', @@ -319,7 +319,7 @@ CREATE TABLE IF NOT EXISTS `fsuggest` ( PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `group` ( +CREATE TABLE IF NOT EXISTS `groups` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `hash` char(255) NOT NULL DEFAULT '', `uid` int(10) unsigned NOT NULL, @@ -639,7 +639,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `created` datetime NOT NULL, `edited` datetime NOT NULL, `title` char(255) NOT NULL, - `desc` text NOT NULL, + `description` text NOT NULL, `album` char(255) NOT NULL, `filename` char(255) NOT NULL, `type` char(128) NOT NULL DEFAULT 'image/jpeg', -- cgit v1.2.3