From d3f623d184c4f2b8314d90e5427c8633a4b0bd80 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 17 May 2019 00:43:24 +0200 Subject: [PATCH] Improved on the mysql default selected values to use InnoDB, utf8mb4, utf8mb4_general_ci --- README.md | 4 ++-- admin/README.txt | 4 ++-- .../en-GB/en-GB.com_componentbuilder.ini | 4 +--- admin/models/admin_view.php | 16 ++++++++++++++++ admin/models/forms/admin_view.xml | 16 +++++----------- admin/models/joomla_component.php | 14 ++++++-------- componentbuilder.xml | 2 +- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 9c6490ec9..19e759ab3 100644 --- a/README.md +++ b/README.md @@ -146,11 +146,11 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 15th May, 2019 ++ *Last Build*: 16th May, 2019 + *Version*: 2.9.18 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **206387** ++ *Line count*: **206393** + *Field count*: **1136** + *File count*: **1344** + *Folder count*: **209** diff --git a/admin/README.txt b/admin/README.txt index 9c6490ec9..19e759ab3 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -146,11 +146,11 @@ TODO + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 15th May, 2019 ++ *Last Build*: 16th May, 2019 + *Version*: 2.9.18 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved. + *License*: GNU General Public License version 2 or later; see LICENSE.txt -+ *Line count*: **206387** ++ *Line count*: **206393** + *Field count*: **1136** + *File count*: **1344** + *Folder count*: **209** diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index 980a285a3..a07e188dc 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -746,9 +746,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_GENERIC="Generic" COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_BIN_CHARSET_GEOSTDEIGHT="geostd8_bin (charset = geostd8)" COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GENERAL_CI_CHARSET_GEOSTDEIGHT="geostd8_general_ci (charset = geostd8)" COM_COMPONENTBUILDER_ADMIN_VIEW_GEOSTDEIGHT_GEOSTDEIGHT_GEORGIAN_MOST_SUITABLE_COLLATION_GEOSTDEIGHT_GENERAL_CI="geostd8 - GEOSTD8 Georgian (most suitable collation = geostd8_general_ci)" -COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_MYISAM="Global (default = MyISAM)" -COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT="Global (default = utf8)" -COM_COMPONENTBUILDER_ADMIN_VIEW_GLOBAL_DEFAULT_UTFEIGHT_GENERAL_CI="Global (default = utf8_general_ci)" COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_BIN_CHARSET_GREEK="greek_bin (charset = greek)" COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_GENERAL_CI_CHARSET_GREEK="greek_general_ci (charset = greek)" COM_COMPONENTBUILDER_ADMIN_VIEW_GREEK_ISO_EIGHT_THOUSAND_EIGHT_HUNDRED_AND_FIFTY_NINESEVEN_GREEK_MOST_SUITABLE_COLLATION_GREEK_GENERAL_CI="greek - ISO 8859-7 Greek (most suitable collation = greek_general_ci)" @@ -950,6 +947,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL="Tab Setup Options" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_NOT_REQUIRED="Not Required" +COM_COMPONENTBUILDER_ADMIN_VIEW_OMIT="Omit" COM_COMPONENTBUILDER_ADMIN_VIEW_ONLY_FUNCTION="Only Function" COM_COMPONENTBUILDER_ADMIN_VIEW_ORDERING_LABEL="Ordering" COM_COMPONENTBUILDER_ADMIN_VIEW_PALETTE="Palette" diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 7bcce1a50..f456d2198 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -419,6 +419,22 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $this->_db->updateObject('#__componentbuilder_admin_view', $objectUpdate, 'id'); } + + // update the mysql_table_engine defaults + if (isset($item->mysql_table_engine) && is_numeric($item->mysql_table_engine)) + { + $item->mysql_table_engine = 'MyISAM'; + } + // update the mysql_table_charset defaults + if (isset($item->mysql_table_charset) && is_numeric($item->mysql_table_charset)) + { + $item->mysql_table_charset = 'utf8'; + } + // update the mysql_table_collate defaults + if (isset($item->mysql_table_collate) && is_numeric($item->mysql_table_collate)) + { + $item->mysql_table_collate = 'utf8_general_ci'; + } if (!empty($item->id)) { diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 9099467ab..1fe000cd8 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -352,10 +352,8 @@ multiple="false" filter="CMD" required="true" - default="1"> + default="utf8mb4_general_ci"> - + COM_COMPONENTBUILDER_ADMIN_VIEW_OMIT