From ca1add20a00e85fbabeb32e1478b6e93fd1fb1ea Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 23 Jun 2018 04:46:22 +0000
Subject: [PATCH] Small corrections to the database definition
---
boot.php | 2 +-
database.sql | 28 ++++++++++++++--------------
src/Database/DBStructure.php | 28 ++++++++++++++--------------
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/boot.php b/boot.php
index 46bb2a3f8e..9bc02584c2 100644
--- 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.08-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
-define('DB_UPDATE_VERSION', 1269);
+define('DB_UPDATE_VERSION', 1270);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**
diff --git a/database.sql b/database.sql
index d084ba519c..9dc0bcb187 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
-- ------------------------------------------
-- Friendica 2018.08-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1269
+-- DB_UPDATE_VERSION 1270
-- ------------------------------------------
@@ -668,6 +668,19 @@ CREATE TABLE IF NOT EXISTS `oembed` (
INDEX `created` (`created`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='cache for OEmbed queries';
+--
+-- TABLE openwebauth-token
+--
+CREATE TABLE IF NOT EXISTS `openwebauth-token` (
+ `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
+ `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
+ `type` varchar(32) NOT NULL DEFAULT '' COMMENT 'Verify type',
+ `token` varchar(255) NOT NULL DEFAULT '' COMMENT 'A generated token',
+ `meta` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+ `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation',
+ PRIMARY KEY(`id`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Store OpenWebAuth token to verify contacts';
+
--
-- TABLE parsed_url
--
@@ -1084,19 +1097,6 @@ CREATE TABLE IF NOT EXISTS `user-item` (
PRIMARY KEY(`uid`,`iid`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User specific item data';
---
--- TABLE openwebauth-token
---
-CREATE TABLE IF NOT EXISTS `openwebauth-token` (
- `id` int(10) NOT NULL auto_increment COMMENT 'sequential ID',
- `uid` int(10) unsigned NOT NULL DEFAULT 0 COMMENT 'User id',
- `type` varchar(32) DEFAULT '' COMMENT 'Verify type',
- `token` varchar(255) DEFAULT '' COMMENT 'A generated token',
- `meta` varchar(255) DEFAULT '' COMMENT '',
- `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation',
- PRIMARY KEY(`id`)
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Store OpenWebAuth token to verify contacts';
-
--
-- TABLE worker-ipc
--
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 0d7ba49e42..a089ab8942 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -1381,6 +1381,20 @@ class DBStructure
"created" => ["created"],
]
];
+ $database["openwebauth-token"] = [
+ "comment" => "Store OpenWebAuth token to verify contacts",
+ "fields" => [
+ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
+ "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
+ "type" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Verify type"],
+ "token" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A generated token"],
+ "meta" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+ "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of creation"],
+ ],
+ "indexes" => [
+ "PRIMARY" => ["id"],
+ ]
+ ];
$database["parsed_url"] = [
"comment" => "cache for 'parse_url' queries",
"fields" => [
@@ -1818,20 +1832,6 @@ class DBStructure
"PRIMARY" => ["uid", "iid"],
]
];
- $database["openwebauth-token"] = [
- "comment" => "Store OpenWebAuth token to verify contacts",
- "fields" => [
- "id" => ["type" => "int(10)", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
- "uid" => ["type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => ["user" => "uid"], "comment" => "User id"],
- "type" => ["type" => "varchar(32)", "not_null", "default" => "", "comment" => "Verify type"],
- "token" => ["type" => "varchar(255)", "not_null" => "1", "default" => "", "comment" => "A generated token"],
- "meta" => ["type" => "varchar(255)", "not_null" => "1", "default" => "", "comment" => ""],
- "created" => ["type" => "datetime", "not null" => "1", "default" => NULL_DATE, "comment" => "datetime of creation"],
- ],
- "indexes" => [
- "PRIMARY" => ["id"],
- ]
- ];
$database["worker-ipc"] = [
"comment" => "Inter process communication between the frontend and the worker",
"fields" => [