continue;
$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);
// Compare it
$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 ($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));
- }
-
$names = "";
foreach ($fieldnames AS $fieldname) {
if ($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"),
)
);
"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"),
"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"),
"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"),
"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"),
$database["fcontact"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
+ "guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"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_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"),
"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"),
"uid_wall_created" => array("uid","wall","created"),
"resource-id" => array("resource-id"),
"uid_type" => array("uid","type"),
- "uid_starred" => array("uid","starred"),
+ "uid_starred_id" => array("uid","starred", "id"),
"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"),
"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"),
$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"),
"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"),
"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(
$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"),
switch ($argv[1]) {
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;
}
}
projects / friendica.git / blobdiff