Skip to content

Commit 5559eed

Browse files
authored
[4.0] Change collations of com_finder tables to unicode on MySQL databases also in the component's install sql (#28455)
* Unicode collation in com_finder install.mysql.sql * Comments in com_finder install.postgresql.sql
1 parent 5947367 commit 5559eed

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

administrator/components/com_finder/sql/install.mysql.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_filters` (
1818
`data` text,
1919
`params` mediumtext,
2020
PRIMARY KEY (`filter_id`)
21-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
21+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
2222

2323
--
2424
-- Table structure for table `#__finder_links`
@@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_links` (
5252
KEY `idx_language` (`language`),
5353
KEY `idx_published_list` (`published`,`state`,`access`,`publish_start_date`,`publish_end_date`,`list_price`),
5454
KEY `idx_published_sale` (`published`,`state`,`access`,`publish_start_date`,`publish_end_date`,`sale_price`)
55-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
55+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
5656

5757
--
5858
-- Table structure for table `#__finder_links_terms`
@@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_links_terms` (
6565
PRIMARY KEY (`link_id`,`term_id`),
6666
KEY `idx_term_weight` (`term_id`,`weight`),
6767
KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
68-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
68+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
6969

7070
--
7171
-- Table structure for table `#__finder_logging`
@@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_logging` (
7979
`results` INT(11) NOT NULL DEFAULT 0,
8080
PRIMARY KEY (`md5sum`),
8181
INDEX `searchterm` (`searchterm`(191))
82-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
82+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
8383

8484
--
8585
-- Table structure for table `#__finder_taxonomy`
@@ -105,7 +105,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_taxonomy` (
105105
INDEX `idx_alias` (`alias`(100)),
106106
INDEX `idx_language` (`language`),
107107
INDEX `idx_parent_published` (`parent_id`, `state`, `access`)
108-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
108+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
109109

110110
--
111111
-- Dumping data for table `#__finder_taxonomy`
@@ -124,7 +124,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_taxonomy_map` (
124124
PRIMARY KEY (`link_id`,`node_id`),
125125
KEY `link_id` (`link_id`),
126126
KEY `node_id` (`node_id`)
127-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
127+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
128128

129129
--
130130
-- Table structure for table `#__finder_terms`
@@ -147,7 +147,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_terms` (
147147
KEY `idx_stem_phrase` (`stem`,`phrase`),
148148
KEY `idx_soundex_phrase` (`soundex`,`phrase`),
149149
KEY `idx_language` (`language`)
150-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
150+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
151151

152152
--
153153
-- Table structure for table `#__finder_terms_common`
@@ -357,7 +357,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_tokens` (
357357
KEY `idx_stem` (`stem`),
358358
KEY `idx_context` (`context`),
359359
KEY `idx_language` (`language`)
360-
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
360+
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
361361

362362
--
363363
-- Table structure for table `#__finder_tokens_aggregate`
@@ -376,7 +376,7 @@ CREATE TABLE IF NOT EXISTS `#__finder_tokens_aggregate` (
376376
`language` char(7) NOT NULL DEFAULT '',
377377
KEY `token` (`term`),
378378
KEY `keyword_id` (`term_id`)
379-
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
379+
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
380380

381381
--
382382
-- Table structure for table `#__finder_types`
@@ -388,4 +388,4 @@ CREATE TABLE IF NOT EXISTS `#__finder_types` (
388388
`mime` varchar(100) NOT NULL DEFAULT '',
389389
PRIMARY KEY (`id`),
390390
UNIQUE KEY `title` (`title`)
391-
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
391+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;

administrator/components/com_finder/sql/install.postgresql.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ CREATE INDEX "#__finder_links_idx_published_list" on "#__finder_links" ("publish
5555
CREATE INDEX "#__finder_links_idx_published_sale" on "#__finder_links" ("published", "state", "access", "publish_start_date", "publish_end_date", "sale_price");
5656

5757
--
58-
-- Table: #__finder_links_terms
58+
-- Table structure for table `#__finder_links_terms`
5959
--
60+
6061
CREATE TABLE IF NOT EXISTS "#__finder_links_terms" (
6162
"link_id" integer NOT NULL,
6263
"term_id" integer NOT NULL,
@@ -82,7 +83,7 @@ CREATE INDEX "#__finder_logging_idx_md5sum" on "#__finder_logging" ("md5sum");
8283
CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searchterm");
8384

8485
--
85-
-- Table: #__finder_taxonomy
86+
-- Table structure for table `#__finder_taxonomy`
8687
--
8788

8889
CREATE TABLE IF NOT EXISTS "#__finder_taxonomy" (
@@ -110,6 +111,7 @@ CREATE INDEX "#__finder_taxonomy_idx_parent_published" on "#__finder_taxonomy" (
110111
--
111112
-- Dumping data for table `#__finder_taxonomy`
112113
--
114+
113115
INSERT INTO "#__finder_taxonomy" ("id", "parent_id", "lft", "rgt", "level", "path", "title", "alias", "state", "access", "language") VALUES
114116
(1, 0, 0, 1, 0, '', 'ROOT', 'root', 1, 1, '*');
115117

0 commit comments

Comments
 (0)