Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity

Fix specified key was too long (#3513)

Browse Source 
* Fix specified key was too long

This adds the correct engine and sets it to utf8mb4 collate. Prevents "Specified key was too long; max key length is 1000 bytes" from happening.

* Make two import SQL files consistent 

As suggested by @prefiks
This commit is contained in:
Divine 2021-02-02 00:50:33 +03:00 committed by GitHub
parent bb397bb424
commit 22d76bd1a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysql.new.sql
View File

@ -430,7 +430,7 @@ CREATE TABLE push_session (
node text NOT NULL, node text NOT NULL,
xml text NOT NULL, xml text NOT NULL,
PRIMARY KEY (server_host(191), username(191), timestamp) PRIMARY KEY (server_host(191), username(191), timestamp)
); ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE UNIQUE INDEX i_push_session_susn ON push_session (server_host(191), username(191), service(191), node(191)); CREATE UNIQUE INDEX i_push_session_susn ON push_session (server_host(191), username(191), service(191), node(191));
@ -502,4 +502,4 @@ CREATE TABLE mqtt_pub (
user_properties blob NOT NULL, user_properties blob NOT NULL,
expiry int unsigned NOT NULL, expiry int unsigned NOT NULL,
UNIQUE KEY i_mqtt_topic_server (topic(191), server_host) UNIQUE KEY i_mqtt_topic_server (topic(191), server_host)
); ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

4
sql/mysql.sql
View File

@ -398,7 +398,7 @@ CREATE TABLE push_session (
service text NOT NULL, service text NOT NULL,
node text NOT NULL, node text NOT NULL,
xml text NOT NULL xml text NOT NULL
); ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
CREATE UNIQUE INDEX i_push_usn ON push_session (username(191), service(191), node(191)); CREATE UNIQUE INDEX i_push_usn ON push_session (username(191), service(191), node(191));
CREATE UNIQUE INDEX i_push_ut ON push_session (username(191), timestamp); CREATE UNIQUE INDEX i_push_ut ON push_session (username(191), timestamp);
@ -469,4 +469,4 @@ CREATE TABLE mqtt_pub (
user_properties blob NOT NULL, user_properties blob NOT NULL,
expiry int unsigned NOT NULL, expiry int unsigned NOT NULL,
UNIQUE KEY i_mqtt_topic (topic(191)) UNIQUE KEY i_mqtt_topic (topic(191))
); ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;