// don't delete yet, will be done later when contacts have deleted my stuff
// q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
q("UPDATE `user` SET `account_removed` = 1, `account_expires_on` = UTC_TIMESTAMP() WHERE `uid` = %d", intval($uid));
- proc_run('php', "include/notifier.php", "removeme", $uid);
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "removeme", $uid);
// Send an update to the directory
- proc_run('php', "include/directory.php", $r[0]['url']);
+ proc_run(PRIORITY_LOW, "include/directory.php", $r[0]['url']);
if($uid == local_user()) {
unset($_SESSION['authenticated']);
}
else {
- /// @todo
+ /// @todo
/// We really should send a notification to the owner after 2-3 weeks
/// so they won't be surprised when the contact vanishes and can take
/// remedial action if this was a serious mistake or glitch
* @brief Get contact data for a given profile link
*
* The function looks at several places (contact table and gcontact table) for the contact
+ * It caches its result for the same script execution to prevent duplicate calls
*
* @param string $url The profile link
* @param int $uid User id
* @return array Contact data
*/
function get_contact_details_by_url($url, $uid = -1, $default = array()) {
- if ($uid == -1)
+ static $cache = array();
+
+ if ($uid == -1) {
$uid = local_user();
+ }
+
+ if (isset($cache[$url][$uid])) {
+ return $cache[$url][$uid];
+ }
// Fetch contact data from the contact table for the given user
- $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, `self`
+ $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
dbesc(normalise_link($url)), intval($uid));
// Fetch the data from the contact table with "uid=0" (which is filled automatically)
if (!$r)
- $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
- `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `bd` AS `birthday`, 0 AS `self`
+ $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+ `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
dbesc(normalise_link($url)));
// Fetch the data from the gcontact table
if (!$r)
- $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`,
- `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `birthday`, 0 AS `self`
+ $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
+ `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `nurl` = '%s'",
dbesc(normalise_link($url)));
if ($r) {
// If there is more than one entry we filter out the connector networks
- if (count($r) > 1)
- foreach ($r AS $id => $result)
- if ($result["network"] == NETWORK_STATUSNET)
+ if (count($r) > 1) {
+ foreach ($r AS $id => $result) {
+ if ($result["network"] == NETWORK_STATUSNET) {
unset($r[$id]);
+ }
+ }
+ }
$profile = array_shift($r);
$profile["bd"] = $current_year."-".$month."-".$day;
$current = $current_year."-".$current_month."-".$current_day;
- if ($profile["bd"] < $current)
+ if ($profile["bd"] < $current) {
$profile["bd"] = (++$current_year)."-".$month."-".$day;
- } else
+ }
+ } else {
$profile["bd"] = "0000-00-00";
- } else
+ }
+ } else {
$profile = $default;
+ }
- if (($profile["photo"] == "") AND isset($default["photo"]))
+ if (($profile["photo"] == "") AND isset($default["photo"])) {
$profile["photo"] = $default["photo"];
+ }
- if (($profile["name"] == "") AND isset($default["name"]))
+ if (($profile["name"] == "") AND isset($default["name"])) {
$profile["name"] = $default["name"];
+ }
- if (($profile["network"] == "") AND isset($default["network"]))
+ if (($profile["network"] == "") AND isset($default["network"])) {
$profile["network"] = $default["network"];
+ }
- if (($profile["thumb"] == "") AND isset($profile["photo"]))
+ if (($profile["thumb"] == "") AND isset($profile["photo"])) {
$profile["thumb"] = $profile["photo"];
+ }
- if (($profile["micro"] == "") AND isset($profile["thumb"]))
+ if (($profile["micro"] == "") AND isset($profile["thumb"])) {
$profile["micro"] = $profile["thumb"];
+ }
if ((($profile["addr"] == "") OR ($profile["name"] == "")) AND ($profile["gid"] != 0) AND
- in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
- proc_run('php',"include/update_gcontact.php", $profile["gid"]);
+ in_array($profile["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
+ proc_run(PRIORITY_LOW, "include/update_gcontact.php", $profile["gid"]);
+ }
// Show contact details of Diaspora contacts only if connected
if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
$profile["birthday"] = "0000-00-00";
}
- return($profile);
- }
+ $cache[$url][$uid] = $profile;
- if(! function_exists('contact_photo_menu')){
- function contact_photo_menu($contact, $uid = 0) {
+ return $profile;
+ }
+ if (! function_exists('contact_photo_menu')) {
+ function contact_photo_menu($contact, $uid = 0)
+ {
$a = get_app();
- $contact_url="";
- $pm_url="";
- $status_link="";
- $photos_link="";
- $posts_link="";
- $contact_drop_link = "";
- $poke_link="";
+ $contact_url = '';
+ $pm_url = '';
+ $status_link = '';
+ $photos_link = '';
+ $posts_link = '';
+ $contact_drop_link = '';
+ $poke_link = '';
- if ($uid == 0)
+ if ($uid == 0) {
$uid = local_user();
+ }
- if ($contact["uid"] != $uid) {
+ if ($contact['uid'] != $uid) {
if ($uid == 0) {
$profile_link = zrl($contact['url']);
- $menu = Array('profile' => array(t("View Profile"), $profile_link, true));
+ $menu = Array('profile' => array(t('View Profile'), $profile_link, true));
return $menu;
}
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
- dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid));
- if ($r)
+ dbesc($contact['nurl']), dbesc($contact['network']), intval($uid));
+ if ($r) {
return contact_photo_menu($r[0], $uid);
- else {
+ } else {
$profile_link = zrl($contact['url']);
$connlnk = 'follow/?url='.$contact['url'];
- $menu = Array(
- 'profile' => array(t("View Profile"), $profile_link, true),
- 'follow' => array(t("Connect/Follow"), $connlnk, true)
- );
+ $menu = array(
+ 'profile' => array(t('View Profile'), $profile_link, true),
+ 'follow' => array(t('Connect/Follow'), $connlnk, true)
+ );
return $menu;
}
}
$sparkle = false;
- if($contact['network'] === NETWORK_DFRN) {
+ if ($contact['network'] === NETWORK_DFRN) {
$sparkle = true;
$profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
- }
- else
+ } else {
$profile_link = $contact['url'];
+ }
- if($profile_link === 'mailbox')
+ if ($profile_link === 'mailbox') {
$profile_link = '';
+ }
- if($sparkle) {
- $status_link = $profile_link . "?url=status";
- $photos_link = $profile_link . "?url=photos";
- $profile_link = $profile_link . "?url=profile";
+ if ($sparkle) {
+ $status_link = $profile_link . '?url=status';
+ $photos_link = $profile_link . '?url=photos';
+ $profile_link = $profile_link . '?url=profile';
}
- if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
+ if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+ }
- if ($contact["network"] == NETWORK_DFRN)
+ if ($contact['network'] == NETWORK_DFRN) {
$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+ }
$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
- $posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts';
- $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
+ $posts_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
+ $contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
/**
* menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
*/
- $menu = Array(
+ $menu = array(
'status' => array(t("View Status"), $status_link, true),
'profile' => array(t("View Profile"), $profile_link, true),
- 'photos' => array(t("View Photos"), $photos_link,true),
- 'network' => array(t("Network Posts"), $posts_link,false),
- 'edit' => array(t("Edit Contact"), $contact_url, false),
+ 'photos' => array(t("View Photos"), $photos_link, true),
+ 'network' => array(t("Network Posts"), $posts_link, false),
+ 'edit' => array(t("View Contact"), $contact_url, false),
'drop' => array(t("Drop Contact"), $contact_drop_link, false),
'pm' => array(t("Send PM"), $pm_url, false),
'poke' => array(t("Poke"), $poke_link, false),
$menucondensed = array();
- foreach ($menu AS $menuname=>$menuitem)
- if ($menuitem[1] != "")
+ foreach ($menu AS $menuname => $menuitem) {
+ if ($menuitem[1] != '') {
$menucondensed[$menuname] = $menuitem;
+ }
+ }
return $menucondensed;
}}
return $r;
}
- function get_contact($url, $uid = 0) {
+ /**
+ * @brief Fetch the contact id for a given url and user
+ *
+ * @param string $url Contact URL
+ * @param integer $uid The user id for the contact
+ * @param boolean $no_update Don't update the contact
+ *
+ * @return integer Contact ID
+ */
+ function get_contact($url, $uid = 0, $no_update = false) {
require_once("include/Scrape.php");
+ logger("Get contact data for url ".$url." and user ".$uid." - ".App::callstack(), LOGGER_DEBUG);;
+
$data = array();
$contactid = 0;
$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -7 days'));
//$update_photo = ($contact[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
- if (!$update_photo)
+ if (!$update_photo OR $no_update) {
return($contactid);
+ }
} elseif ($uid != 0)
return 0;
if ($contactid == 0) {
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
`name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
- `batch`, `request`, `confirm`, `poco`,
+ `batch`, `request`, `confirm`, `poco`, `name-date`, `uri-date`,
`writable`, `blocked`, `readonly`, `pending`)
- VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
+ VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', 1, 0, 0, 0)",
intval($uid),
dbesc(datetime_convert()),
dbesc($data["url"]),
dbesc($data["batch"]),
dbesc($data["request"]),
dbesc($data["confirm"]),
- dbesc($data["poco"])
+ dbesc($data["poco"]),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert())
);
$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
update_contact_avatar($data["photo"],$uid,$contactid);
- q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
- `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
- dbesc($data["addr"]),
- dbesc($data["alias"]),
- dbesc($data["name"]),
- dbesc($data["nick"]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contactid)
- );
+ $r = q("SELECT `addr`, `alias`, `name`, `nick` FROM `contact` WHERE `id` = %d", intval($contactid));
+
+ // This condition should always be true
+ if (!dbm::is_result($r))
+ return $contactid;
+
+ // Only update if there had something been changed
+ if (($data["addr"] != $r[0]["addr"]) OR
+ ($data["alias"] != $r[0]["alias"]) OR
+ ($data["name"] != $r[0]["name"]) OR
+ ($data["nick"] != $r[0]["nick"]))
+ q("UPDATE `contact` SET `addr` = '%s', `alias` = '%s', `name` = '%s', `nick` = '%s',
+ `name-date` = '%s', `uri-date` = '%s' WHERE `id` = %d",
+ dbesc($data["addr"]),
+ dbesc($data["alias"]),
+ dbesc($data["name"]),
+ dbesc($data["nick"]),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval($contactid)
+ );
return $contactid;
}
return $o;
}
-
/**
- * @brief Returns posts from a given contact
+ * @brief Returns posts from a given contact url
*
* @param App $a argv application class
- * @param int $contact_id contact
+ * @param int $contact_url Contact URL
*
* @return string posts in HTML
*/
-function posts_from_contact($a, $contact_id) {
+function posts_from_contact_url($a, $contact_url) {
require_once('include/conversation.php');
- $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
- if (!$r)
- return false;
+ // There are no posts with "uid = 0" with connector networks
+ // This speeds up the query a lot
+ $r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
+ WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
+ dbesc(normalise_link($contact_url)));
+ if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
+ $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
+ else
+ $sql = "`item`.`uid` = %d";
- $contact = $r[0];
+ $author_id = intval($r[0]["author-id"]);
- if(get_config('system', 'old_pager')) {
+ if (get_config('system', 'old_pager')) {
$r = q("SELECT COUNT(*) AS `total` FROM `item`
- WHERE `item`.`uid` = %d AND `author-link` IN ('%s', '%s')",
- intval(local_user()),
- dbesc(str_replace("https://", "http://", $contact["url"])),
- dbesc(str_replace("http://", "https://", $contact["url"])));
+ WHERE `author-id` = %d and $sql",
+ intval($author_id),
+ intval(local_user()));
$a->set_pager_total($r[0]['total']);
}
- $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+/*
+"SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`author-name` AS `name`, `owner-avatar` AS `photo`,
`owner-link` AS `url`, `owner-avatar` AS `thumb`
- FROM `item` FORCE INDEX (`uid_contactid_id`)
- WHERE `item`.`uid` = %d AND `contact-id` = %d
- AND `author-link` IN ('%s', '%s')
- AND NOT `deleted` AND NOT `moderated` AND `visible`
- ORDER BY `item`.`id` DESC LIMIT %d, %d",
+ FROM `item` FORCE INDEX (`authorid_created`)
+ WHERE `item`.`author-id` = %d AND $sql
+ AND NOT `deleted` AND NOT `moderated` AND `visible`
+
+*/
+
+ $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
+ " ORDER BY `item`.`created` DESC LIMIT %d, %d",
+ intval($author_id),
intval(local_user()),
- intval($contact_id),
- dbesc(str_replace("https://", "http://", $contact["url"])),
- dbesc(str_replace("http://", "https://", $contact["url"])),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
- $o .= conversation($a,$r,'community',false);
+ $o = conversation($a,$r,'community',false);
- if(!get_config('system', 'old_pager'))
+ if(!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($r));
- else
+ } else {
$o .= paginate($a);
+ }
return $o;
}
return $location;
}
+
+ /**
+ * @brief Returns the account type name
+ *
+ * The function can be called with either the user or the contact array
+ *
+ * @param array $contact contact or user array
+ */
+ function account_type($contact) {
+
+ // There are several fields that indicate that the contact or user is a forum
+ // "page-flags" is a field in the user table,
+ // "forum" and "prv" are used in the contact table. They stand for PAGE_COMMUNITY and PAGE_PRVGROUP.
+ // "community" is used in the gcontact table and is true if the contact is PAGE_COMMUNITY or PAGE_PRVGROUP.
+ if((isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_COMMUNITY))
+ || (isset($contact['page-flags']) && (intval($contact['page-flags']) == PAGE_PRVGROUP))
+ || (isset($contact['forum']) && intval($contact['forum']))
+ || (isset($contact['prv']) && intval($contact['prv']))
+ || (isset($contact['community']) && intval($contact['community'])))
+ $type = ACCOUNT_TYPE_COMMUNITY;
+ else
+ $type = ACCOUNT_TYPE_PERSON;
+
+ // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
+ if (isset($contact["contact-type"]))
+ $type = $contact["contact-type"];
+ if (isset($contact["account-type"]))
+ $type = $contact["account-type"];
+
+ switch($type) {
+ case ACCOUNT_TYPE_ORGANISATION:
+ $account_type = t("Organisation");
+ break;
+ case ACCOUNT_TYPE_NEWS:
+ $account_type = t('News');
+ break;
+ case ACCOUNT_TYPE_COMMUNITY:
+ $account_type = t("Forum");
+ break;
+ default:
+ $account_type = "";
+ break;
+ }
+
+ return $account_type;
+ }
?>
if ($index["Index_type"] == "FULLTEXT")
continue;
+ if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
+ $indexdata[$index["Key_name"]] = array('UNIQUE');
+ }
+
$column = $index["Column_name"];
- if ($index["Sub_part"] != "")
+ // On utf8mb4 a varchar index can only have a length of 191
+ // To avoid the need to add this to every index definition we just ignore it here.
+ // Exception are primary indexes
+ // Since there are some combindex primary indexes we use the limit of 180 here.
+ if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 180) OR ($index["Key_name"] == "PRIMARY")))
$column .= "(".$index["Sub_part"].")";
$indexdata[$index["Key_name"]][] = $column;
return(array("fields"=>$fielddata, "indexes"=>$indexdata));
}
- function print_structure($database) {
+ function print_structure($database, $charset) {
echo "-- ------------------------------------------\n";
echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n";
echo "--\n";
echo "-- TABLE $name\n";
echo "--\n";
- db_create_table($name, $structure['fields'], true, false, $structure["indexes"]);
+ db_create_table($name, $structure['fields'], $charset, true, false, $structure["indexes"]);
echo "\n";
}
function update_structure($verbose, $action, $tables=null, $definition=null) {
global $a, $db;
+ if ($action)
+ set_config('system', 'maintenance', 1);
+
+ if (isset($a->config["system"]["db_charset"]))
+ $charset = $a->config["system"]["db_charset"];
+ else
+ $charset = "utf8";
+
$errors = false;
logger('updating structure', LOGGER_DEBUG);
// Get the definition
if (is_null($definition))
- $definition = db_definition();
+ $definition = db_definition($charset);
+ // Ensure index conversion to unique removes duplicates
+ $sql_config = "SET session old_alter_table=1;";
+ if ($verbose)
+ echo $sql_config."\n";
+ if ($action)
+ @$db->q($sql_config);
+
+ // MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
+ if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
+ !(strpos($db->server_info(), 'MariaDB') !== false)) {
+ $ignore = '';
+ }else {
+ $ignore = ' IGNORE';
+ }
// Compare it
foreach ($definition AS $name => $structure) {
$is_new_table = False;
$sql3="";
if (!isset($database[$name])) {
- $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
+ $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
if(false === $r) {
$errors .= t('Errors encountered creating database tables.').$name.EOL;
}
if ($current_index_definition != $new_index_definition && substr($indexname, 0, 6) != 'local_') {
$sql2=db_drop_index($indexname);
if ($sql3 == "")
- $sql3 = "ALTER TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER".$ignore." TABLE `".$name."` ".$sql2;
else
$sql3 .= ", ".$sql2;
}
$sql2=db_create_index($indexname, $fieldnames);
if ($sql2 != "") {
if ($sql3 == "")
- $sql3 = "ALTER TABLE `".$name."` ".$sql2;
+ $sql3 = "ALTER" . $ignore . " TABLE `".$name."` ".$sql2;
else
$sql3 .= ", ".$sql2;
}
}
}
+ if ($action)
+ set_config('system', 'maintenance', 0);
+
return $errors;
}
return($fieldstruct);
}
- function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
+ function db_create_table($name, $fields, $charset, $verbose, $action, $indexes=null) {
global $a, $db;
$r = true;
$sql = implode(",\n\t", $sql_rows);
- $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8";
+ $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=".$charset;
if ($verbose)
echo $sql.";\n";
killme();
}
-
- if ($indexname == "PRIMARY") {
- return sprintf("%s PRIMARY KEY(`%s`)", $method, implode("`,`", $fieldnames));
+ if ($fieldnames[0] == "UNIQUE") {
+ array_shift($fieldnames);
+ $method .= ' UNIQUE';
}
$names = "";
$names .= "`".dbesc($fieldname)."`";
}
+ if ($indexname == "PRIMARY") {
+ return sprintf("%s PRIMARY KEY(%s)", $method, $names);
+ }
+
$sql = sprintf("%s INDEX `%s` (%s)", $method, dbesc($indexname), $names);
return($sql);
}
- function db_definition() {
+ function db_index_suffix($charset, $reduce = 0) {
+ if ($charset != "utf8mb4")
+ return "";
+
+ // On utf8mb4 indexes can only have a length of 191
+ $indexlength = 191 - $reduce;
+
+ return "(".$indexlength.")";
+ }
+
+ function db_definition($charset) {
$database = array();
"data" => array("type" => "longblob", "not null" => "1"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
- "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
- "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
$database["cache"] = array(
"fields" => array(
"k" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
- "v" => array("type" => "text", "not null" => "1"),
+ "v" => array("type" => "text"),
"expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
- "PRIMARY" => array("k"),
+ "PRIMARY" => array("k".db_index_suffix($charset)),
"updated" => array("updated"),
+ "expire_mode_updated" => array("expire_mode", "updated"),
)
);
$database["challenge"] = array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "v" => array("type" => "text", "not null" => "1"),
+ "v" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "cat_k" => array("cat(30)","k(30)"),
+ "cat_k" => array("UNIQUE", "cat(30)","k(30)"),
)
);
$database["contact"] = array(
"name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nick" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "about" => array("type" => "text", "not null" => "1"),
- "keywords" => array("type" => "text", "not null" => "1"),
+ "about" => array("type" => "text"),
+ "keywords" => array("type" => "text"),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
+ "xmpp" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"attag" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "photo" => array("type" => "text", "not null" => "1"),
- "thumb" => array("type" => "text", "not null" => "1"),
- "micro" => array("type" => "text", "not null" => "1"),
- "site-pubkey" => array("type" => "text", "not null" => "1"),
+ "photo" => array("type" => "text"),
+ "thumb" => array("type" => "text"),
+ "micro" => array("type" => "text"),
+ "site-pubkey" => array("type" => "text"),
"issued-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"dfrn-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "pubkey" => array("type" => "text", "not null" => "1"),
- "prvkey" => array("type" => "text", "not null" => "1"),
+ "pubkey" => array("type" => "text"),
+ "prvkey" => array("type" => "text"),
"batch" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "request" => array("type" => "text", "not null" => "1"),
- "notify" => array("type" => "text", "not null" => "1"),
- "poll" => array("type" => "text", "not null" => "1"),
- "confirm" => array("type" => "text", "not null" => "1"),
- "poco" => array("type" => "text", "not null" => "1"),
+ "request" => array("type" => "text"),
+ "notify" => array("type" => "text"),
+ "poll" => array("type" => "text"),
+ "confirm" => array("type" => "text"),
+ "poco" => array("type" => "text"),
"aes_allow" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"ret-aes" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"usehub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"writable" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"forum" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"prv" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
+ "contact-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
"hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"rating" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
- "reason" => array("type" => "text", "not null" => "1"),
+ "reason" => array("type" => "text"),
"closeness" => array("type" => "tinyint(2)", "not null" => "1", "default" => "99"),
- "info" => array("type" => "mediumtext", "not null" => "1"),
+ "info" => array("type" => "mediumtext"),
"profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""),
"bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"),
"notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
- "ffi_keyword_blacklist" => array("type" => "mediumtext", "not null" => "1"),
+ "ffi_keyword_blacklist" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"uid" => array("uid"),
+ "addr_uid" => array("addr", "uid"),
"nurl" => array("nurl"),
)
);
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
- "recips" => array("type" => "mediumtext", "not null" => "1"),
+ "recips" => array("type" => "mediumtext"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
- "subject" => array("type" => "mediumtext", "not null" => "1"),
+ "subject" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
),
"indexes" => array(
"PRIMARY" => array("id"),
+ "cmd_item_contact" => array("UNIQUE", "cmd", "item", "contact"),
)
);
$database["event"] = array(
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"start" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"finish" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
- "summary" => array("type" => "text", "not null" => "1"),
- "desc" => array("type" => "text", "not null" => "1"),
- "location" => array("type" => "text", "not null" => "1"),
+ "summary" => array("type" => "text"),
+ "desc" => array("type" => "text"),
+ "location" => array("type" => "text"),
"type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
- "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"priority" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "pubkey" => array("type" => "text", "not null" => "1"),
+ "pubkey" => array("type" => "text"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"server" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"posturl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "key" => array("type" => "text", "not null" => "1"),
+ "key" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "note" => array("type" => "text", "not null" => "1"),
+ "note" => array("type" => "text"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
"last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "about" => array("type" => "text", "not null" => "1"),
- "keywords" => array("type" => "text", "not null" => "1"),
+ "about" => array("type" => "text"),
+ "keywords" => array("type" => "text"),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"),
"community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
+ "contact-type" => array("type" => "tinyint(1)", "not null" => "1", "default" => "-1"),
"hide" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"nsfw" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "notify" => array("type" => "text", "not null" => "1"),
+ "notify" => array("type" => "text"),
"alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"generation" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
"server_url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"site_name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "info" => array("type" => "text", "not null" => "1"),
+ "info" => array("type" => "text"),
"register_policy" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"poco" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"knowyou" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
- "note" => array("type" => "text", "not null" => "1"),
+ "note" => array("type" => "text"),
"hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"datetime" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"author-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"author-avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "body" => array("type" => "mediumtext", "not null" => "1"),
+ "body" => array("type" => "mediumtext"),
"app" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"object-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "object" => array("type" => "text", "not null" => "1"),
+ "object" => array("type" => "text"),
"target-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "target" => array("type" => "text", "not null" => "1"),
- "postopts" => array("type" => "text", "not null" => "1"),
+ "target" => array("type" => "text"),
+ "postopts" => array("type" => "text"),
"plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"event-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
- "tag" => array("type" => "mediumtext", "not null" => "1"),
- "attach" => array("type" => "mediumtext", "not null" => "1"),
- "inform" => array("type" => "mediumtext", "not null" => "1"),
- "file" => array("type" => "mediumtext", "not null" => "1"),
+ "tag" => array("type" => "mediumtext"),
+ "attach" => array("type" => "mediumtext"),
+ "inform" => array("type" => "mediumtext"),
+ "file" => array("type" => "mediumtext"),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"coord" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
- "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
"private" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"moderated" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"mention" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"rendered-hash" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
- "rendered-html" => array("type" => "mediumtext", "not null" => "1"),
+ "rendered-html" => array("type" => "mediumtext"),
"global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
),
"indexes" => array(
"uid_created" => array("uid","created"),
"uid_unseen_contactid" => array("uid","unseen","contact-id"),
"uid_network_received" => array("uid","network","received"),
- "uid_received" => array("uid","received"),
- "uid_network_commented" => array("uid","network","commented"),
- "uid_commented" => array("uid","commented"),
+ //"uid_received" => array("uid","received"),
+ //"uid_network_commented" => array("uid","network","commented"),
+ //"uid_commented" => array("uid","commented"),
"uid_title" => array("uid","title"),
"uid_thrparent" => array("uid","thr-parent"),
"uid_parenturi" => array("uid","parent-uri"),
"uid_contactid_id" => array("uid","contact-id","id"),
- "uid_contactid_created" => array("uid","contact-id","created"),
+ //"uid_contactid_created" => array("uid","contact-id","created"),
"gcontactid_uid_created" => array("gcontact-id","uid","created"),
"authorid_created" => array("author-id","created"),
"ownerid_created" => array("owner-id","created"),
- "wall_body" => array("wall","body(6)"),
- "uid_visible_moderated_created" => array("uid","visible","moderated","created"),
- "uid_uri" => array("uid", "uri"),
+ //"wall_body" => array("wall","body(6)"),
+ //"uid_visible_moderated_created" => array("uid","visible","moderated","created"),
+ "uid_uri" => array("uid","uri"),
"uid_wall_created" => array("uid","wall","created"),
"resource-id" => array("resource-id"),
"uid_type" => array("uid","type"),
"contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"),
"uid_wall_parent_created" => array("uid","wall","parent","created"),
"uid_type_changed" => array("uid","type","changed"),
- "contactid_verb" => array("contact-id","verb"),
+ //"contactid_verb" => array("contact-id","verb"),
+ "contactid" => array("contact-id"),
"deleted_changed" => array("deleted","changed"),
"uid_wall_changed" => array("uid","wall","changed"),
"uid_eventid" => array("uid","event-id"),
"contact-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"convid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "body" => array("type" => "mediumtext", "not null" => "1"),
+ "body" => array("type" => "mediumtext"),
"seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"reply" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"replied" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"ssltype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
"mailbox" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"user" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "pass" => array("type" => "text", "not null" => "1"),
+ "pass" => array("type" => "text"),
"reply_to" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"action" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"movetofolder" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
- "msg" => array("type" => "mediumtext", "not null" => "1"),
+ "msg" => array("type" => "mediumtext"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"otype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
+ "name_cache" => array("type" => "tinytext"),
+ "msg_cache" => array("type" => "mediumtext")
),
"indexes" => array(
"PRIMARY" => array("id"),
$database["oembed"] = array(
"fields" => array(
"url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
- "content" => array("type" => "text", "not null" => "1"),
+ "content" => array("type" => "text"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
- "PRIMARY" => array("url"),
+ "PRIMARY" => array("url".db_index_suffix($charset)),
"created" => array("created"),
)
);
"url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
"guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
"oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
- "content" => array("type" => "text", "not null" => "1"),
+ "content" => array("type" => "text"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
- "PRIMARY" => array("url", "guessing", "oembed"),
+ "PRIMARY" => array("url".db_index_suffix($charset), "guessing", "oembed"),
"created" => array("created"),
)
);
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "v" => array("type" => "mediumtext", "not null" => "1"),
+ "v" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "uid_cat_k" => array("uid","cat(30)","k(30)"),
+ "uid_cat_k" => array("UNIQUE", "uid","cat(30)","k(30)"),
)
);
$database["photo"] = array(
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "desc" => array("type" => "text", "not null" => "1"),
+ "desc" => array("type" => "text"),
"album" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"filename" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"type" => array("type" => "varchar(128)", "not null" => "1", "default" => "image/jpeg"),
"data" => array("type" => "mediumblob", "not null" => "1"),
"scale" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
"profile" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
- "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
- "uid" => array("uid"),
+ "uid_contactid" => array("uid", "contact-id"),
+ "uid_profile" => array("uid", "profile"),
+ "uid_album_created" => array("uid", "album", "created"),
"resource-id" => array("resource-id"),
"guid" => array("guid"),
)
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
- "q0" => array("type" => "mediumtext", "not null" => "1"),
- "q1" => array("type" => "mediumtext", "not null" => "1"),
- "q2" => array("type" => "mediumtext", "not null" => "1"),
- "q3" => array("type" => "mediumtext", "not null" => "1"),
- "q4" => array("type" => "mediumtext", "not null" => "1"),
- "q5" => array("type" => "mediumtext", "not null" => "1"),
- "q6" => array("type" => "mediumtext", "not null" => "1"),
- "q7" => array("type" => "mediumtext", "not null" => "1"),
- "q8" => array("type" => "mediumtext", "not null" => "1"),
- "q9" => array("type" => "mediumtext", "not null" => "1"),
+ "q0" => array("type" => "mediumtext"),
+ "q1" => array("type" => "mediumtext"),
+ "q2" => array("type" => "mediumtext"),
+ "q3" => array("type" => "mediumtext"),
+ "q4" => array("type" => "mediumtext"),
+ "q5" => array("type" => "mediumtext"),
+ "q6" => array("type" => "mediumtext"),
+ "q7" => array("type" => "mediumtext"),
+ "q8" => array("type" => "mediumtext"),
+ "q9" => array("type" => "mediumtext"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"choice" => array("choice"),
)
);
+ $database["process"] = array(
+ "fields" => array(
+ "pid" => array("type" => "int(10) unsigned", "not null" => "1", "primary" => "1"),
+ "command" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
+ "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+ ),
+ "indexes" => array(
+ "PRIMARY" => array("pid"),
+ "command" => array("command"),
+ )
+ );
$database["profile"] = array(
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"hometown" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"marital" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "with" => array("type" => "text", "not null" => "1"),
+ "with" => array("type" => "text"),
"howlong" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"sexual" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"politic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"religion" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "pub_keywords" => array("type" => "text", "not null" => "1"),
- "prv_keywords" => array("type" => "text", "not null" => "1"),
- "likes" => array("type" => "text", "not null" => "1"),
- "dislikes" => array("type" => "text", "not null" => "1"),
- "about" => array("type" => "text", "not null" => "1"),
+ "pub_keywords" => array("type" => "text"),
+ "prv_keywords" => array("type" => "text"),
+ "likes" => array("type" => "text"),
+ "dislikes" => array("type" => "text"),
+ "about" => array("type" => "text"),
"summary" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "music" => array("type" => "text", "not null" => "1"),
- "book" => array("type" => "text", "not null" => "1"),
- "tv" => array("type" => "text", "not null" => "1"),
- "film" => array("type" => "text", "not null" => "1"),
- "interest" => array("type" => "text", "not null" => "1"),
- "romance" => array("type" => "text", "not null" => "1"),
- "work" => array("type" => "text", "not null" => "1"),
- "education" => array("type" => "text", "not null" => "1"),
- "contact" => array("type" => "text", "not null" => "1"),
+ "music" => array("type" => "text"),
+ "book" => array("type" => "text"),
+ "tv" => array("type" => "text"),
+ "film" => array("type" => "text"),
+ "interest" => array("type" => "text"),
+ "romance" => array("type" => "text"),
+ "work" => array("type" => "text"),
+ "education" => array("type" => "text"),
+ "contact" => array("type" => "text"),
"homepage" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "xmpp" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"thumb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"publish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"last" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
- "content" => array("type" => "mediumtext", "not null" => "1"),
+ "content" => array("type" => "mediumtext"),
"batch" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
),
"indexes" => array(
"fields" => array(
"id" => array("type" => "bigint(20) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "data" => array("type" => "text", "not null" => "1"),
+ "data" => array("type" => "text"),
"expire" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
),
"indexes" => array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
- "signed_text" => array("type" => "mediumtext", "not null" => "1"),
- "signature" => array("type" => "text", "not null" => "1"),
+ "signed_text" => array("type" => "mediumtext"),
+ "signature" => array("type" => "text"),
"signer" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
),
"indexes" => array(
"type_term" => array("type","term"),
"uid_otype_type_term_global_created" => array("uid","otype","type","term","global","created"),
"otype_type_term_tid" => array("otype","type","term","tid"),
+ "uid_otype_type_url" => array("uid","otype","type","url"),
"guid" => array("guid"),
)
);
$database["tokens"] = array(
"fields" => array(
"id" => array("type" => "varchar(40)", "not null" => "1", "primary" => "1"),
- "secret" => array("type" => "text", "not null" => "1"),
+ "secret" => array("type" => "text"),
"client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => ""),
"expires" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"scope" => array("type" => "varchar(200)", "not null" => "1", "default" => ""),
"default-location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"allow_location" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"theme" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
- "pubkey" => array("type" => "text", "not null" => "1"),
- "prvkey" => array("type" => "text", "not null" => "1"),
- "spubkey" => array("type" => "text", "not null" => "1"),
- "sprvkey" => array("type" => "text", "not null" => "1"),
+ "pubkey" => array("type" => "text"),
+ "prvkey" => array("type" => "text"),
+ "spubkey" => array("type" => "text"),
+ "sprvkey" => array("type" => "text"),
"verified" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"blocked" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"blockwall" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
"cntunkmail" => array("type" => "int(11)", "not null" => "1", "default" => "10"),
"notify-flags" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "65535"),
"page-flags" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+ "account-type" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
"prvnets" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"pwdreset" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"maxreq" => array("type" => "int(11)", "not null" => "1", "default" => "10"),
"expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
- "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
- "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
- "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
- "openidserver" => array("type" => "text", "not null" => "1"),
+ "allow_cid" => array("type" => "mediumtext"),
+ "allow_gid" => array("type" => "mediumtext"),
+ "deny_cid" => array("type" => "mediumtext"),
+ "deny_gid" => array("type" => "mediumtext"),
+ "openidserver" => array("type" => "text"),
),
"indexes" => array(
"PRIMARY" => array("uid"),
$database["workerqueue"] = array(
"fields" => array(
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
- "parameter" => array("type" => "text", "not null" => "1"),
+ "parameter" => array("type" => "text"),
"priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
"created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
if ($argc==2) {
switch ($argv[1]) {
+ case "dryrun":
+ update_structure(true, false);
+ return;
case "update":
update_structure(true, true);
+
+ $build = get_config('system','build');
+ if (!x($build)) {
+ set_config('system','build',DB_UPDATE_VERSION);
+ $build = DB_UPDATE_VERSION;
+ }
+
+ $stored = intval($build);
+ $current = intval(DB_UPDATE_VERSION);
+
+ // run any left update_nnnn functions in update.php
+ for($x = $stored; $x < $current; $x ++) {
+ $r = run_update_function($x);
+ if (!$r) break;
+ }
+
+ set_config('system','build',DB_UPDATE_VERSION);
return;
case "dumpsql":
- print_structure(db_definition());
+ // For the dump that is used to create the database.sql we always assume utfmb4
+ $charset = "utf8mb4";
+ print_structure(db_definition($charset), $charset);
return;
}
}
// print help
echo $argv[0]." <command>\n";
echo "\n";
- echo "commands:\n";
+ echo "Commands:\n";
+ echo "dryrun show database update schema queries without running them\n";
echo "update update database schema\n";
echo "dumpsql dump database schema\n";
return;
projects / friendica.git / commitdiff