From 4ad4aed875e0af79b3bbe4b1ae8060567c101c8a Mon Sep 17 00:00:00 2001 From: El RIDO Date: Tue, 28 Jun 2022 06:51:21 +0200 Subject: [PATCH] apply table prefix to indexes as well, to support multiple instances sharing a single database --- CHANGELOG.md | 2 ++ lib/Data/Database.php | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c036ad..1343024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ * **1.4.1 (not yet released)** * ADDED: Translations for Turkish * CHANGED: Avoid `SUPER` privilege for setting the `sql_mode` for MariaDB/MySQL (#919) + * FIXED: Revert to CREATE INDEX without IF NOT EXISTS clauses, to support MySQL (#943) + * FIXED: Apply table prefix to indexes as well, to support multiple instances sharing a single database (#943) * **1.4 (2022-04-09)** * ADDED: Translations for Corsican, Estonian, Finnish and Lojban * ADDED: new HTTP headers improving security (#765) diff --git a/lib/Data/Database.php b/lib/Data/Database.php index a5b5136..b42c76b 100644 --- a/lib/Data/Database.php +++ b/lib/Data/Database.php @@ -839,7 +839,8 @@ class Database extends AbstractData } else { // CREATE INDEX IF NOT EXISTS not supported as of MySQL <= 8.0 self::$_db->exec( - 'CREATE INDEX "comment_parent" ON "' . + 'CREATE INDEX "' . + self::_sanitizeIdentifier('comment_parent') . '" ON "' . self::_sanitizeIdentifier('comment') . '" ("pasteid")' ); } @@ -942,17 +943,20 @@ class Database extends AbstractData ); } else { self::$_db->exec( - 'CREATE UNIQUE INDEX IF NOT EXISTS "paste_dataid" ON "' . + 'CREATE UNIQUE INDEX IF NOT EXISTS "' . + self::_sanitizeIdentifier('paste_dataid') . '" ON "' . self::_sanitizeIdentifier('paste') . '" ("dataid")' ); self::$_db->exec( - 'CREATE UNIQUE INDEX IF NOT EXISTS "comment_dataid" ON "' . + 'CREATE UNIQUE INDEX IF NOT EXISTS "' . + self::_sanitizeIdentifier('comment_dataid') . '" ON "' . self::_sanitizeIdentifier('comment') . '" ("dataid")' ); } // CREATE INDEX IF NOT EXISTS not supported as of MySQL <= 8.0 self::$_db->exec( - 'CREATE INDEX "comment_parent" ON "' . + 'CREATE INDEX "' . + self::_sanitizeIdentifier('comment_parent') . '" ON "' . self::_sanitizeIdentifier('comment') . '" ("pasteid")' ); // no break, continue with updates for 0.22 and later