Fix: No "not null" when text is replaced by varchar

diff --git a/boot.php b/boot.php
index fcdce92ccf66f593e9b2438f3b09e6229ae2e4e4..71050fe4d7831ccfec23ccc1e63c747335677a3c 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -41,7 +41,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'The Tazmans Flax-lily');
 define('FRIENDICA_VERSION',      '2018-05-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1257);
+define('DB_UPDATE_VERSION',      1258);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**

diff --git a/database.sql b/database.sql
index 8778a0c1c87a1a2d2bf53612e05409b232e6a6a0..e8662f95c8d86888e10104c20ef8e8d051e1f55d 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2018-05-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1257
+-- DB_UPDATE_VERSION 1258
 -- ------------------------------------------
 
 
@@ -122,9 +122,9 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `attag` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `thumb` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `micro` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `photo` varchar(255) DEFAULT '' COMMENT '',
+       `thumb` varchar(255) DEFAULT '' COMMENT '',
+       `micro` varchar(255) DEFAULT '' COMMENT '',
        `site-pubkey` text COMMENT '',
        `issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -1079,3 +1079,4 @@ CREATE TABLE IF NOT EXISTS `workerqueue` (
         INDEX `executed` (`executed`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
+

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 9e6ce5b97f834b9aaedc82b08fe91a50c473beb6..5d527aac60a50dfbcd3ec057628fd613e0d86d23 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -788,9 +788,9 @@ class DBStructure
                                                "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                "attag" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                "avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                                               "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                                               "thumb" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                                               "micro" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                                               "photo" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
+                                               "thumb" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
+                                               "micro" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
                                                "site-pubkey" => ["type" => "text", "comment" => ""],
                                                "issued-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                                                "dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],