X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdbstructure.php;h=6a14220c241bcdef90757555074e3a0a000da964;hb=cb3077b7a9023a65b6dc13df065bfbbe7f7633fb;hp=156d3eb645cb1a50faeb9576a1a961a914547e47;hpb=35dc56c9c25f30823ff1cfbefe8ea9eab47cc6ee;p=friendica.git

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 156d3eb645..6a14220c24 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1,6 +1,7 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\App;
+use Friendica\Core\Config;
 
 require_once("boot.php");
 require_once("include/text.php");
@@ -300,6 +301,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 					// Compare the field definition
 					$field_definition = $database[$name]["fields"][$fieldname];
 
+					// Remove the relation data that is used for the referential integrity
+					unset($parameters['relation']);
+
 					// We change the collation after the indexes had been changed.
 					// This is done to avoid index length problems.
 					// So here we always ensure that there is no need to change it.
@@ -395,6 +399,14 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 				$sql3 .= ";";
 			}
 
+			$field_list = '';
+			if ($is_unique && $ignore == '') {
+				foreach ($structure['fields'] AS $fieldname => $parameters) {
+					$field_list .= 'ANY_VALUE(`' . $fieldname . '`),';
+				}
+				$field_list = rtrim($field_list, ',');
+			}
+
 			if ($verbose) {
 				// Ensure index conversion to unique removes duplicates
 				if ($is_unique) {
@@ -411,7 +423,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 					if ($ignore != "") {
 						echo "SET session old_alter_table=0;\n";
 					} else {
-						echo "INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";\n";
+						echo "INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";\n";
 						echo "DROP TABLE `".$name."`;\n";
 						echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
 					}
@@ -442,7 +454,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 					if ($ignore != "") {
 						$db->q("SET session old_alter_table=0;");
 					} else {
-						$r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
+						$r = $db->q("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
 						if (!dbm::is_result($r)) {
 							$errors .= print_update_error($db, $sql3);
 							return $errors;
@@ -627,7 +639,7 @@ function db_definition() {
 	$database["attach"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"hash" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
 					"filename" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"filetype" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
@@ -647,7 +659,7 @@ function db_definition() {
 	$database["auth_codes"] = array(
 			"fields" => array(
 					"id" => array("type" => "varchar(40)", "not null" => "1", "primary" => "1"),
-					"client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => ""),
+					"client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => "", "relation" => array("clients" => "client_id")),
 					"redirect_uri" => array("type" => "varchar(200)", "not null" => "1", "default" => ""),
 					"expires" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"scope" => array("type" => "varchar(250)", "not null" => "1", "default" => ""),
@@ -688,7 +700,7 @@ function db_definition() {
 					"redirect_uri" => array("type" => "varchar(200)", "not null" => "1", "default" => ""),
 					"name" => array("type" => "text"),
 					"icon" => array("type" => "text"),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("client_id"),
@@ -709,7 +721,7 @@ function db_definition() {
 	$database["contact"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"self" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"remote_self" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -798,7 +810,7 @@ function db_definition() {
 					"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" => "text"),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
@@ -820,7 +832,7 @@ function db_definition() {
 					"received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					),
 			"indexes" => array(
-					"PRIMARY" => array("item-uri", "protocol"),
+					"PRIMARY" => array("item-uri"),
 					"conversation-uri" => array("conversation-uri"),
 					)
 			);
@@ -828,8 +840,8 @@ function db_definition() {
 			"fields" => array(
 					"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
 					"guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
@@ -875,15 +887,15 @@ function db_definition() {
 			"indexes" => array(
 					"PRIMARY" => array("id"),
 					"addr" => array("addr(32)"),
-					"url" => array("url"),
+					"url" => array("UNIQUE", "url(190)"),
 					)
 			);
 	$database["ffinder"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"cid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"fid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"cid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
+					"fid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("fcontact" => "id")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
@@ -904,8 +916,8 @@ function db_definition() {
 	$database["fsuggest"] = array(
 			"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"),
-					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -920,8 +932,8 @@ function db_definition() {
 	$database["gcign"] = array(
 			"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"),
-					"gcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"gcid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("gcontact" => "id")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
@@ -960,7 +972,7 @@ function db_definition() {
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
-					"nurl" => array("nurl(64)"),
+					"nurl" => array("UNIQUE", "nurl(190)"),
 					"name" => array("name(64)"),
 					"nick" => array("nick(32)"),
 					"addr" => array("addr(64)"),
@@ -971,10 +983,10 @@ function db_definition() {
 	$database["glink"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"gcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"zcid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"gcid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("gcontact" => "id")),
+					"zcid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("gcontact" => "id")),
 					"updated" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					),
 			"indexes" => array(
@@ -986,7 +998,7 @@ function db_definition() {
 	$database["group"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"visible" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"deleted" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -999,9 +1011,9 @@ function db_definition() {
 	$database["group_member"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"gid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"gid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("group" => "id")),
+					"contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
@@ -1030,7 +1042,7 @@ function db_definition() {
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
-					"nurl" => array("nurl(32)"),
+					"nurl" => array("UNIQUE", "nurl(190)"),
 					)
 			);
 	$database["hook"] = array(
@@ -1049,9 +1061,9 @@ function db_definition() {
 	$database["intro"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"fid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"fid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("fcontact" => "id")),
+					"contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"knowyou" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"note" => array("type" => "text"),
@@ -1066,16 +1078,16 @@ function db_definition() {
 			);
 	$database["item"] = array(
 			"fields" => array(
-					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
+					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "relation" => array("thread" => "iid")),
 					"guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"gcontact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
+					"gcontact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("gcontact" => "id")),
 					"type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"wall" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"gravity" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-					"parent" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"parent" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
 					"parent-uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"extid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"thr-parent" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1084,11 +1096,11 @@ function db_definition() {
 					"commented" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"changed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
-					"owner-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"owner-id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"owner-name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"owner-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"owner-avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-					"author-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"author-id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"author-name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"author-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"author-avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1103,7 +1115,7 @@ function db_definition() {
 					"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"),
+					"event-id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("event" => "id")),
 					"tag" => array("type" => "mediumtext"),
 					"attach" => array("type" => "mediumtext"),
 					"inform" => array("type" => "mediumtext"),
@@ -1149,6 +1161,7 @@ function db_definition() {
 					"uid_parenturi" => array("uid","parent-uri(190)"),
 					"uid_contactid_created" => array("uid","contact-id","created"),
 					"authorid_created" => array("author-id","created"),
+					"ownerid" => array("owner-id"),
 					"uid_uri" => array("uid", "uri(190)"),
 					"resource-id" => array("resource-id"),
 					"contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"), //
@@ -1164,8 +1177,8 @@ function db_definition() {
 	$database["item_id"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"iid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"service" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					),
@@ -1191,13 +1204,13 @@ function db_definition() {
 	$database["mail"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
 					"from-name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"from-photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"from-url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-					"contact-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-					"convid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+					"contact-id" => array("type" => "varchar(255)", "not null" => "1", "default" => "", "relation" => array("contact" => "id")),
+					"convid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("conv" => "id")),
 					"title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"body" => array("type" => "mediumtext"),
 					"seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -1214,12 +1227,13 @@ function db_definition() {
 					"convid" => array("convid"),
 					"uri" => array("uri(64)"),
 					"parent-uri" => array("parent-uri(64)"),
+					"contactid" => array("contact-id"),
 					)
 			);
 	$database["mailacct"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"server" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"port" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"ssltype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
@@ -1239,8 +1253,8 @@ function db_definition() {
 	$database["manage"] = array(
 			"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"),
-					"mid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"mid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
@@ -1257,10 +1271,10 @@ function db_definition() {
 					"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"date" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"msg" => array("type" => "mediumtext"),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-					"iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"parent" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"iid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
+					"parent" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
 					"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" => ""),
@@ -1278,10 +1292,10 @@ function db_definition() {
 	$database["notify-threads"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"notify-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-					"master-parent-item" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"notify-id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("notify" => "id")),
+					"master-parent-item" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
 					"parent-item" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"receiver-uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"receiver-uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
@@ -1314,7 +1328,7 @@ function db_definition() {
 	$database["pconfig"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"cat" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
 					"k" => array("type" => "varbinary(255)", "not null" => "1", "default" => ""),
 					"v" => array("type" => "mediumtext"),
@@ -1327,8 +1341,8 @@ function db_definition() {
 	$database["photo"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
 					"resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
@@ -1351,6 +1365,7 @@ function db_definition() {
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
+					"contactid" => array("contact-id"),
 					"uid_contactid" => array("uid", "contact-id"),
 					"uid_profile" => array("uid", "profile"),
 					"uid_album_scale_created" => array("uid", "album(32)", "scale", "created"),
@@ -1361,7 +1376,7 @@ function db_definition() {
 	$database["poll"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"q0" => array("type" => "text"),
 					"q1" => array("type" => "text"),
 					"q2" => array("type" => "text"),
@@ -1381,7 +1396,7 @@ function db_definition() {
 	$database["poll_result"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"poll_id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"poll_id" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("poll" => "id")),
 					"choice" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					),
 			"indexes" => array(
@@ -1404,7 +1419,7 @@ function db_definition() {
 	$database["profile"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"profile-name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"is-default" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"hide-friends" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -1454,8 +1469,8 @@ function db_definition() {
 	$database["profile_check"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"cid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"cid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"dfrn_id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"sec" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"expire" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
@@ -1467,7 +1482,7 @@ function db_definition() {
 	$database["push_subscriber"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"callback_url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"topic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"nickname" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1482,7 +1497,7 @@ function db_definition() {
 	$database["queue"] = array(
 			"fields" => array(
 					"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"cid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"last" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
@@ -1503,7 +1518,7 @@ function db_definition() {
 					"id" => array("type" => "int(11) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
 					"hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
-					"uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"password" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					"language" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
 					"note" => array("type" => "text"),
@@ -1515,7 +1530,7 @@ function db_definition() {
 	$database["search"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
 					),
 			"indexes" => array(
@@ -1539,7 +1554,7 @@ function db_definition() {
 	$database["sign"] = 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"),
+					"iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
 					"signed_text" => array("type" => "mediumtext"),
 					"signature" => array("type" => "text"),
 					"signer" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1552,7 +1567,7 @@ function db_definition() {
 	$database["spam"] = array(
 			"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"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					"spam" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"ham" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1569,7 +1584,7 @@ function db_definition() {
 	$database["term"] = array(
 			"fields" => array(
 					"tid" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-					"oid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"oid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("item" => "id")),
 					"otype" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
 					"type" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
 					"term" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1579,7 +1594,7 @@ function db_definition() {
 					"received" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
 					"aid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("tid"),
@@ -1591,12 +1606,12 @@ function db_definition() {
 			);
 	$database["thread"] = array(
 			"fields" => array(
-					"iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "primary" => "1"),
-					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-					"contact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
-					"gcontact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
-					"owner-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
-					"author-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
+					"iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "primary" => "1", "relation" => array("item" => "id")),
+					"uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
+					"contact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
+					"gcontact-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("gcontact" => "id")),
+					"owner-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
+					"author-id" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
 					"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"edited" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
 					"commented" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
@@ -1624,6 +1639,9 @@ function db_definition() {
 					"uid_network_created" => array("uid","network","created"),
 					"uid_contactid_commented" => array("uid","contact-id","commented"),
 					"uid_contactid_created" => array("uid","contact-id","created"),
+					"contactid" => array("contact-id"),
+					"ownerid" => array("owner-id"),
+					"authorid" => array("author-id"),
 					"uid_created" => array("uid","created"),
 					"uid_commented" => array("uid","commented"),
 					"uid_wall_created" => array("uid","wall","created"),
@@ -1633,10 +1651,10 @@ function db_definition() {
 			"fields" => array(
 					"id" => array("type" => "varchar(40)", "not null" => "1", "primary" => "1"),
 					"secret" => array("type" => "text"),
-					"client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => ""),
+					"client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => "", "relation" => array("clients" => "client_id")),
 					"expires" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
 					"scope" => array("type" => "varchar(200)", "not null" => "1", "default" => ""),
-					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+					"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
 					),
 			"indexes" => array(
 					"PRIMARY" => array("id"),
@@ -1728,7 +1746,7 @@ function dbstructure_run(&$argv, &$argc) {
 	global $a, $db;
 
 	if (is_null($a)) {
-		$a = new App;
+		$a = new App(dirname(__DIR__));
 	}
 
 	if (is_null($db)) {
@@ -1780,7 +1798,7 @@ function dbstructure_run(&$argv, &$argc) {
 	echo "dryrun		show database update schema queries without running them\n";
 	echo "update		update database schema\n";
 	echo "dumpsql		dump database schema\n";
-	echo "toinnodb		convert all tables from MyISAM to InnoDB\n";
+	echo "toinnodb	convert all tables from MyISAM to InnoDB\n";
 	return;
 
 }