]> git.mxchange.org Git - friendica.git/blobdiff - include/dbstructure.php
projects / friendica.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #3168 from annando/bugfix-contact-posts
[friendica.git] / include / dbstructure.php
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 9a84cfbc8d441dc6ce3d75f79f232aa27ef301d1..f8d084437b16ed18342855b693a3dcc15573a585 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -187,7 +187,8 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
        // Compare it
        foreach ($definition AS $name => $structure) {
                $is_new_table = False;
-               $sql3="";
+               $group_by = "";
+               $sql3 = "";
                if (!isset($database[$name])) {
                        $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
                        if (!dbm::is_result($r)) {
@@ -276,7 +277,12 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                }
                                $new_index_definition = implode(",",$fieldnames);
                                if ($current_index_definition != $new_index_definition) {
-                                       $sql2=db_create_index($indexname, $fieldnames);
+                                       $sql2 = db_create_index($indexname, $fieldnames);
+
+                                       // Fetch the "group by" fields for unique indexes
+                                       if ($fieldnames[0] == "UNIQUE") {
+                                               $group_by = db_group_by($indexname, $fieldnames);
+                                       }
                                        if ($sql2 != "") {
                                                if ($sql3 == "")
                                                        $sql3 = "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
@@ -295,7 +301,6 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        if ($ignore != "") {
                                                echo "SET session old_alter_table=1;\n";
                                        } else {
-                                               echo "DROP TABLE IF EXISTS `".$temp_name."`;\n";
                                                echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
                                        }
                                }
@@ -306,7 +311,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        if ($ignore != "") {
                                                echo "SET session old_alter_table=0;\n";
                                        } else {
-                                               echo "INSERT IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;\n";
+                                               echo "INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";\n";
                                                echo "DROP TABLE `".$name."`;\n";
                                                echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
                                        }
@@ -319,11 +324,6 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                        if ($ignore != "") {
                                                $db->q("SET session old_alter_table=1;");
                                        } else {
-                                               $r = $db->q("DROP TABLE IF EXISTS `".$temp_name."`;");
-                                               if (!dbm::is_result($r)) {
-                                                       $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
-                                                       return $errors;
-                                               }
                                                $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
                                                if (!dbm::is_result($r)) {
                                                        $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
@@ -340,7 +340,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 IGNORE INTO `".$temp_name."` SELECT * FROM `".$name."`;");
+                                               $r = $db->q("INSERT INTO `".$temp_name."` SELECT * FROM `".$name."`".$group_by.";");
                                                if (!dbm::is_result($r)) {
                                                        $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
                                                        return $errors;
@@ -473,6 +473,30 @@ function db_create_index($indexname, $fieldnames, $method="ADD") {
        return($sql);
 }
 
+function db_group_by($indexname, $fieldnames) {
+
+       if ($fieldnames[0] != "UNIQUE") {
+               return "";
+       }
+
+       array_shift($fieldnames);
+
+       $names = "";
+       foreach ($fieldnames AS $fieldname) {
+               if ($names != "")
+                       $names .= ",";
+
+               if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
+                       $names .= "`".dbesc($matches[1])."`";
+               } else {
+                       $names .= "`".dbesc($fieldname)."`";
+               }
+       }
+
+       $sql = sprintf(" GROUP BY %s", $names);
+       return $sql;
+}
+
 function db_index_suffix($charset, $reduce = 0) {
        if ($charset != "utf8mb4") {
                return "";
@@ -491,7 +515,7 @@ function db_definition($charset) {
        $database["addon"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+                                       "name" => array("type" => "varchar(190)", "not null" => "1", "default" => ""),
                                        "version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "installed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "hidden" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -500,6 +524,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
+                                       "name" => array("UNIQUE", "name"),
                                        )
                        );
        $database["attach"] = array(
@@ -513,10 +538,10 @@ function db_definition($charset) {
                                        "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" => "text"),
-                                       "allow_gid" => array("type" => "text"),
-                                       "deny_cid" => array("type" => "text"),
-                                       "deny_gid" => array("type" => "text"),
+                                       "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"),
@@ -717,10 +742,10 @@ function db_definition($charset) {
                                        "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" => "text"),
-                                       "allow_gid" => array("type" => "text"),
-                                       "deny_cid" => array("type" => "text"),
-                                       "deny_gid" => array("type" => "text"),
+                                       "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"),
@@ -835,10 +860,10 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "nurl" => array("nurl(32)"),
-                                       "name" => array("name(32)"),
+                                       "nurl" => array("nurl(64)"),
+                                       "name" => array("name(64)"),
                                        "nick" => array("nick(32)"),
-                                       "addr" => array("addr(32)"),
+                                       "addr" => array("addr(64)"),
                                        "hide_network_updated" => array("hide", "network", "updated"),
                                        "updated" => array("updated"),
                                        )
@@ -918,7 +943,7 @@ function db_definition($charset) {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "hook_file_function" => array("hook(30)","file(60)","function(30)"),
+                                       "hook_file_function" => array("UNIQUE", "hook(50)","file(80)","function(60)"),
                                        )
                        );
        $database["intro"] = array(
@@ -1015,6 +1040,7 @@ function db_definition($charset) {
                                        "parent-uri" => array("parent-uri"),
                                        "extid" => array("extid"),
                                        "uid_id" => array("uid","id"),
+                                       "uid_contactid_id" => array("uid","contact-id","id"),
                                        "uid_created" => array("uid","created"),
                                        "uid_unseen_contactid" => array("uid","unseen","contact-id"),
                                        "uid_network_received" => array("uid","network","received"),
@@ -1555,10 +1581,10 @@ function db_definition($charset) {
                                        "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" => "text"),
-                                       "allow_gid" => array("type" => "text"),
-                                       "deny_cid" => array("type" => "text"),
-                                       "deny_gid" => array("type" => "text"),
+                                       "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(
Unnamed repository; edit this file 'description' to name the repository.