From effc459d611d2a32ce3c270b180c118e4e860bcb Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Mon, 19 Oct 2020 01:59:20 -0400 Subject: [PATCH] 2020-10-19 Fred Gleason * Fixed a bug in rddbmgr(8) that could cause the 'RSS_SCHEMAS', 'FEED_IMAGES' and 'SUPERFEED_MAPS' to be created with incorrect character set and engine type values. Signed-off-by: Fred Gleason --- ChangeLog | 4 ++++ utils/rddbmgr/revertschema.cpp | 4 +++- utils/rddbmgr/updateschema.cpp | 12 +++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d397d988..da463fce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20490,3 +20490,7 @@ * Added a 'webget' subpackage to the 'make rpm' target. 2020-10-18 Fred Gleason * Incremented the package version to 3.4.1int2. +2020-10-19 Fred Gleason + * Fixed a bug in rddbmgr(8) that could cause the 'RSS_SCHEMAS', + 'FEED_IMAGES' and 'SUPERFEED_MAPS' to be created with incorrect + character set and engine type values. diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp index b5c89c0f..2328706a 100644 --- a/utils/rddbmgr/revertschema.cpp +++ b/utils/rddbmgr/revertschema.cpp @@ -413,7 +413,9 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) "HEADER_XML text,"+ "CHANNEL_XML text,"+ "ITEM_XML text,"+ - "index NAME_IDX(NAME))"; + "index NAME_IDX(NAME)) "+ + " charset utf8mb4 collate utf8mb4_general_ci"+ + db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp index 471c7501..048b383d 100644 --- a/utils/rddbmgr/updateschema.cpp +++ b/utils/rddbmgr/updateschema.cpp @@ -9953,7 +9953,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) "index FEED_ID_IDX(FEED_ID),"+ "index MEMBER_FEED_ID_IDX(MEMBER_FEED_ID),"+ "index KEY_NAME_IDX(KEY_NAME),"+ - "index MEMBER_KEY_NAME_IDX(MEMBER_KEY_NAME))"; + "index MEMBER_KEY_NAME_IDX(MEMBER_KEY_NAME)) "+ + " charset utf8mb4 collate utf8mb4_general_ci"+ + db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10003,7 +10005,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) "HEADER_XML text,"+ "CHANNEL_XML text,"+ "ITEM_XML text,"+ - "index NAME_IDX(NAME))"; + "index NAME_IDX(NAME)) "+ + " charset utf8mb4 collate utf8mb4_general_ci"+ + db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10029,7 +10033,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) "FILE_EXTENSION varchar(10) not null,"+ "DATA mediumblob not null,"+ "index FEED_ID_IDX (FEED_ID),"+ - "index FEED_KEY_NAME_IDX (FEED_KEY_NAME))"; + "index FEED_KEY_NAME_IDX (FEED_KEY_NAME)) "+ + " charset utf8mb4 collate utf8mb4_general_ci"+ + db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; }