From 32e9a4d4d78cd2833607d4909ef2d18d37112af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 14 Nov 2020 15:22:56 +0100 Subject: [PATCH 1/2] Some fixes: - varbinary() is not needed when clear-text words like 'xmpp' are used for them, it also hinders using external tools like Adminer/phpMyAdmin to search for them as e.g. Adminer wraps a HEX() call (SQL) around `k` and `cat` (see table `pconfig`) - added missing UPDATE::SUCCESS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- static/dbstructure.config.php | 10 +++++----- static/dbview.config.php | 0 update.php | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) mode change 100755 => 100644 static/dbstructure.config.php mode change 100755 => 100644 static/dbview.config.php diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php old mode 100755 new mode 100644 index 67b302054a..9fb0c99111 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -54,7 +54,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1373); + define('DB_UPDATE_VERSION', 1374); } return [ @@ -1050,11 +1050,11 @@ return [ "pconfig" => [ "comment" => "personal (per user) configuration storage", "fields" => [ - "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""], + "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Primary key"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "User id"], - "cat" => ["type" => "varbinary(50)", "not null" => "1", "default" => "", "comment" => ""], - "k" => ["type" => "varbinary(100)", "not null" => "1", "default" => "", "comment" => ""], - "v" => ["type" => "mediumtext", "comment" => ""], + "cat" => ["type" => "varchar(50)", "not null" => "1", "default" => "", "comment" => "Category"], + "k" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "Key"], + "v" => ["type" => "mediumtext", "comment" => "Value"], ], "indexes" => [ "PRIMARY" => ["id"], diff --git a/static/dbview.config.php b/static/dbview.config.php old mode 100755 new mode 100644 diff --git a/update.php b/update.php index ec6a94f0e3..7c773f4ee5 100644 --- a/update.php +++ b/update.php @@ -747,4 +747,5 @@ function pre_update_1365() return Update::FAILED; } + return UPDATE::SUCCESS; } From c4a20613a8d829b34de533ddbeb56a99534d78c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Sat, 14 Nov 2020 15:50:24 +0100 Subject: [PATCH 2/2] Ops! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.php b/update.php index 7c773f4ee5..37cccd768d 100644 --- a/update.php +++ b/update.php @@ -747,5 +747,5 @@ function pre_update_1365() return Update::FAILED; } - return UPDATE::SUCCESS; + return Update::SUCCESS; }