clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7546 from annando/fix-db 

Fix table structure definition
This commit is contained in:
Hypolite Petovan 2019-08-21 19:10:59 -04:00 committed by GitHub
parent a0ef733c7e a483ea8acb
commit 73c535f6dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database.sql
View File

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2019.09-rc (Dalmatian Bellflower) -- Friendica 2019.09-rc (Dalmatian Bellflower)
-- DB_UPDATE_VERSION 1321 -- DB_UPDATE_VERSION 1322
-- ------------------------------------------ -- ------------------------------------------
@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `2fa_app_specific_password` (
`generated` datetime NOT NULL COMMENT 'Datetime the password was generated', `generated` datetime NOT NULL COMMENT 'Datetime the password was generated',
`last_used` datetime COMMENT 'Datetime the password was last used', `last_used` datetime COMMENT 'Datetime the password was last used',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
INDEX `uid_description` (`uid`,`description`) INDEX `uid_description` (`uid`,`description`(190))
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor app-specific _password'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Two-factor app-specific _password';
-- --

6
static/dbstructure.config.php
View File

@ -34,7 +34,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1321); define('DB_UPDATE_VERSION', 1322);
} }
return [ return [
@ -44,13 +44,13 @@ return [
"id" => ["type" => "mediumint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Password ID for revocation"], "id" => ["type" => "mediumint unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Password ID for revocation"],
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "relation" => ["user" => "uid"], "comment" => "User ID"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "relation" => ["user" => "uid"], "comment" => "User ID"],
"description" => ["type" => "varchar(255)", "comment" => "Description of the usage of the password"], "description" => ["type" => "varchar(255)", "comment" => "Description of the usage of the password"],
"hashed_password" => ["type" => "varchar(255)", "not null" => "1", "primary" => "1", "comment" => "Hashed password"], "hashed_password" => ["type" => "varchar(255)", "not null" => "1", "comment" => "Hashed password"],
"generated" => ["type" => "datetime", "not null" => "1", "comment" => "Datetime the password was generated"], "generated" => ["type" => "datetime", "not null" => "1", "comment" => "Datetime the password was generated"],
"last_used" => ["type" => "datetime", "comment" => "Datetime the password was last used"], "last_used" => ["type" => "datetime", "comment" => "Datetime the password was last used"],
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["id"], "PRIMARY" => ["id"],
"uid_description" => ["uid", "description"], "uid_description" => ["uid", "description(190)"],
] ]
], ],
"2fa_recovery_codes" => [ "2fa_recovery_codes" => [