From 5dee22c94d1ab366c88a7d3058867e70f5cfb827 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 25 Dec 2013 01:22:51 -0800 Subject: db update for directory profiles - and fix broken database.sql from the sys_perms addition a couple days back --- boot.php | 2 +- install/database.sql | 31 ++++++++++++++++++------------- install/update.php | 12 +++++++++++- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/boot.php b/boot.php index 777d927d2..eeaae7c8c 100755 --- a/boot.php +++ b/boot.php @@ -46,7 +46,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1087 ); +define ( 'DB_UPDATE_VERSION', 1088 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index cb332c75b..6be73f193 100644 --- a/install/database.sql +++ b/install/database.sql @@ -54,7 +54,7 @@ CREATE TABLE IF NOT EXISTS `account` ( `account_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_expire_notified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `account_service_class` char(32) NOT NULL DEFAULT '', - `account_level` int(10) unsigned NOT NULL DEFAULT 0, + `account_level` int(10) unsigned NOT NULL, PRIMARY KEY (`account_id`), KEY `account_email` (`account_email`), KEY `account_service_class` (`account_service_class`), @@ -848,6 +848,15 @@ CREATE TABLE IF NOT EXISTS `spam` ( KEY `term` (`term`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `sys_perms` ( + `id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `cat` char(255) NOT NULL, + `k` char(255) NOT NULL, + `v` mediumtext NOT NULL, + `public_perm` tinyint(1) unsigned NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `term` ( `tid` int(10) unsigned NOT NULL AUTO_INCREMENT, `aid` int(10) unsigned NOT NULL DEFAULT '0', @@ -915,7 +924,7 @@ CREATE TABLE IF NOT EXISTS `verify` ( KEY `token` (`token`), KEY `meta` (`meta`), KEY `created` (`created`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `vote` ( `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -971,7 +980,7 @@ CREATE TABLE IF NOT EXISTS `xconfig` ( KEY `xchan` (`xchan`), KEY `cat` (`cat`), KEY `k` (`k`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xign` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -1008,6 +1017,9 @@ CREATE TABLE IF NOT EXISTS `xprof` ( `xprof_postcode` char(32) NOT NULL DEFAULT '', `xprof_country` char(255) NOT NULL DEFAULT '', `xprof_keywords` text NOT NULL, + `xprof_about` text NOT NULL, + `xprof_homepage` char(255) NOT NULL DEFAULT '', + `xprof_hometown` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`xprof_hash`), KEY `xprof_desc` (`xprof_desc`), KEY `xprof_dob` (`xprof_dob`), @@ -1018,7 +1030,8 @@ CREATE TABLE IF NOT EXISTS `xprof` ( KEY `xprof_region` (`xprof_region`), KEY `xprof_postcode` (`xprof_postcode`), KEY `xprof_country` (`xprof_country`), - KEY `xprof_age` (`xprof_age`) + KEY `xprof_age` (`xprof_age`), + KEY `xprof_hometown` (`xprof_hometown`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xtag` ( @@ -1030,12 +1043,4 @@ CREATE TABLE IF NOT EXISTS `xtag` ( KEY `xtag_term` (`xtag_term`), KEY `xtag_hash` (`xtag_hash`), KEY `xtag_flags` (`xtag_flags`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - -CREATE TABLE if not exists `sys_perms` ( - `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , - `cat` CHAR( 255 ) NOT NULL , - `k` CHAR( 255 ) NOT NULL , - `v` MEDIUMTEXT NOT NULL, - `public_perm` TINYINT( 1 ) UNSIGNED NOT NULL -) ENGINE = MYISAM DEFAULT CHARSET = utf8"); +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index c731eab06..8e64413dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@