]> 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
And now DiscoverPoCo.php
[friendica.git] / include / dbstructure.php
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 2e47111c2ef870fbc963b94599bd01f314eed1ae..1df82b1beda5b5e50e3648c77d1572187dc10f37 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once "boot.php";
 require_once "include/text.php";
@@ -20,7 +21,7 @@ function convert_to_innodb() {
        $r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
                dbesc(dba::database_name()));
 
-       if (!dbm::is_result($r)) {
+       if (!DBM::is_result($r)) {
                echo t('There are no tables on MyISAM.')."\n";
                return;
        }
@@ -30,7 +31,7 @@ function convert_to_innodb() {
                echo $sql."\n";
 
                $result = dba::e($sql);
-               if (!dbm::is_result($result)) {
+               if (!DBM::is_result($result)) {
                        print_update_error($sql);
                }
        }
@@ -50,7 +51,7 @@ function update_fail($update_id, $error_message) {
        );
 
        // No valid result?
-       if (!dbm::is_result($adminlist)) {
+       if (!DBM::is_result($adminlist)) {
                logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_NORMAL);
 
                // Don't continue
@@ -114,7 +115,7 @@ function table_structure($table) {
 
        $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
 
-       if (dbm::is_result($table_status)) {
+       if (DBM::is_result($table_status)) {
                $table_status = $table_status[0];
        } else {
                $table_status = array();
@@ -123,23 +124,21 @@ function table_structure($table) {
        $fielddata = array();
        $indexdata = array();
 
-       if (dbm::is_result($indexes))
+       if (DBM::is_result($indexes))
                foreach ($indexes AS $index) {
                        if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
                                $indexdata[$index["Key_name"]] = array('UNIQUE');
                        }
 
                        $column = $index["Column_name"];
-                       // On utf8mb4 a varchar index can only have a length of 191
-                       // The "show index" command sometimes returns this value although this value wasn't added manually.
-                       // Because we don't want to add this number to every index, we ignore bigger numbers
-                       if (($index["Sub_part"] != "") && (($index["Sub_part"] < 191) || ($index["Key_name"] == "PRIMARY"))) {
+
+                       if (($index["Sub_part"] != "")) {
                                $column .= "(".$index["Sub_part"].")";
                        }
 
                        $indexdata[$index["Key_name"]][] = $column;
                }
-       if (dbm::is_result($structures)) {
+       if (DBM::is_result($structures)) {
                foreach ($structures AS $field) {
                        $fielddata[$field["Field"]]["type"] = $field["Type"];
                        if ($field["Null"] == "NO") {
@@ -159,7 +158,7 @@ function table_structure($table) {
                        }
                }
        }
-       if (dbm::is_result($full_columns)) {
+       if (DBM::is_result($full_columns)) {
                foreach ($full_columns AS $column) {
                        $fielddata[$column["Field"]]["Collation"] = $column["Collation"];
                }
@@ -202,7 +201,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
        if ($action) {
                Config::set('system', 'maintenance', 1);
-               Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e')));
+               Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), DBM::date().' '.date('e')));
        }
 
        $errors = false;
@@ -216,7 +215,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                $tables = q("SHOW TABLES");
        }
 
-       if (dbm::is_result($tables)) {
+       if (DBM::is_result($tables)) {
                foreach ($tables AS $table) {
                        $table = current($table);
 
@@ -245,7 +244,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                $sql3 = "";
                if (!isset($database[$name])) {
                        $r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
-                       if (!dbm::is_result($r)) {
+                       if (!DBM::is_result($r)) {
                                $errors .= print_update_error($name);
                        }
                        $is_new_table = True;
@@ -435,7 +434,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                        }
 
                        if ($action) {
-                               Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name));
+                               Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), DBM::date().' '.date('e'), $name));
 
                                // Ensure index conversion to unique removes duplicates
                                if ($is_unique && ($temp_name != $name)) {
@@ -443,13 +442,13 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                                dba::e("SET session old_alter_table=1;");
                                        } else {
                                                dba::e("DROP TABLE IF EXISTS `".$temp_name."`;");
-                                               if (!dbm::is_result($r)) {
+                                               if (!DBM::is_result($r)) {
                                                        $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
 
                                                $r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
-                                               if (!dbm::is_result($r)) {
+                                               if (!DBM::is_result($r)) {
                                                        $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
@@ -457,7 +456,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                }
 
                                $r = @dba::e($sql3);
-                               if (!dbm::is_result($r)) {
+                               if (!DBM::is_result($r)) {
                                        $errors .= print_update_error($sql3);
                                }
                                if ($is_unique && ($temp_name != $name)) {
@@ -465,17 +464,17 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                                                dba::e("SET session old_alter_table=0;");
                                        } else {
                                                $r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
-                                               if (!dbm::is_result($r)) {
+                                               if (!DBM::is_result($r)) {
                                                        $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                                $r = dba::e("DROP TABLE `".$name."`;");
-                                               if (!dbm::is_result($r)) {
+                                               if (!DBM::is_result($r)) {
                                                        $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
                                                $r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
-                                               if (!dbm::is_result($r)) {
+                                               if (!DBM::is_result($r)) {
                                                        $errors .= print_update_error($sql3);
                                                        return $errors;
                                                }
@@ -817,8 +816,8 @@ function db_definition() {
                                        "addr_uid" => array("addr(32)", "uid"),
                                        "nurl_uid" => array("nurl(32)", "uid"),
                                        "nick_uid" => array("nick(32)", "uid"),
-                                       "dfrn-id" => array("dfrn-id"),
-                                       "issued-id" => array("issued-id"),
+                                       "dfrn-id" => array("dfrn-id(64)"),
+                                       "issued-id" => array("issued-id(64)"),
                                        )
                        );
        $database["conv"] = array(
@@ -1162,11 +1161,11 @@ function db_definition() {
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
-                                       "guid" => array("guid"),
-                                       "uri" => array("uri"),
+                                       "guid" => array("guid(191)"),
+                                       "uri" => array("uri(191)"),
                                        "parent" => array("parent"),
-                                       "parent-uri" => array("parent-uri"),
-                                       "extid" => array("extid"),
+                                       "parent-uri" => array("parent-uri(191)"),
+                                       "extid" => array("extid(191)"),
                                        "uid_id" => array("uid","id"),
                                        "uid_contactid_id" => array("uid","contact-id","id"),
                                        "uid_created" => array("uid","created"),
@@ -1179,7 +1178,7 @@ function db_definition() {
                                        "authorid_created" => array("author-id","created"),
                                        "ownerid" => array("owner-id"),
                                        "uid_uri" => array("uid", "uri(190)"),
-                                       "resource-id" => array("resource-id"),
+                                       "resource-id" => array("resource-id(191)"),
                                        "contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"), //
                                        "uid_type_changed" => array("uid","type(190)","changed"),
                                        "contactid_verb" => array("contact-id","verb(190)"),
@@ -1201,7 +1200,7 @@ function db_definition() {
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
                                        "uid" => array("uid"),
-                                       "sid" => array("sid"),
+                                       "sid" => array("sid(32)"),
                                        "service" => array("service(32)"),
                                        "iid" => array("iid"),
                                        )
@@ -1243,7 +1242,7 @@ function db_definition() {
                                        "convid" => array("convid"),
                                        "uri" => array("uri(64)"),
                                        "parent-uri" => array("parent-uri(64)"),
-                                       "contactid" => array("contact-id"),
+                                       "contactid" => array("contact-id(32)"),
                                        )
                        );
        $database["mailacct"] = array(
@@ -1594,7 +1593,7 @@ function db_definition() {
                                        "uid" => array("uid"),
                                        "spam" => array("spam"),
                                        "ham" => array("ham"),
-                                       "term" => array("term"),
+                                       "term" => array("term(32)"),
                                        )
                        );
        $database["term"] = array(
@@ -1783,9 +1782,9 @@ function dbstructure_run(&$argv, &$argc) {
                        case "update":
                                update_structure(true, true);
 
-                               $build = get_config('system','build');
+                               $build = Config::get('system','build');
                                if (!x($build)) {
-                                       set_config('system', 'build', DB_UPDATE_VERSION);
+                                       Config::set('system', 'build', DB_UPDATE_VERSION);
                                        $build = DB_UPDATE_VERSION;
                                }
 
@@ -1800,7 +1799,7 @@ function dbstructure_run(&$argv, &$argc) {
                                        }
                                }
 
-                               set_config('system','build',DB_UPDATE_VERSION);
+                               Config::set('system','build',DB_UPDATE_VERSION);
                                return;
                        case "dumpsql":
                                print_structure(db_definition());
Unnamed repository; edit this file 'description' to name the repository.