Task techjoomla#4 chore: Updated table charset and collation

praneettekdi · Jul 18, 2019 · c20763b · c20763b
1 parent cd02980
commit c20763b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/components/com_cluster/administrator/sql/install.mysql.utf8.sql b/src/components/com_cluster/administrator/sql/install.mysql.utf8.sql
@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_clusters` (
   `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `description` text NOT NULL DEFAULT '',
   `params` text NOT NULL DEFAULT '',
-  `client` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `client` varchar(400) NOT NULL DEFAULT '',
   `client_id` int(11) NOT NULL DEFAULT '0',
   `ordering` int(11) NOT NULL DEFAULT '0',
   `state` tinyint(3) NOT NULL DEFAULT '0',
@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_clusters` (
   `modified_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `modified_by` int(11) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
-) ENGINE = MyISAM CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 
 CREATE TABLE IF NOT EXISTS `#__tj_cluster_nodes` (
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_cluster_nodes` (
   `modified_by` int(11) UNSIGNED NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   FOREIGN KEY (`cluster_id`) REFERENCES `#__tj_clusters` (`id`)
-) ENGINE = MyISAM CHARSET=utf8mb4 COLLATE utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Indexes for table `__tj_cluster_nodes`

diff --git a/src/components/com_cluster/administrator/sql/updates/mysql/1.0.1.sql b/src/components/com_cluster/administrator/sql/updates/mysql/1.0.1.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `#__tj_clusters` ENGINE = InnoDB;
+ALTER TABLE `#__tj_cluster_nodes` ENGINE = InnoDB;
+
+ALTER TABLE `#__tj_clusters` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__tj_cluster_nodes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/src/components/com_cluster/cluster.xml b/src/components/com_cluster/cluster.xml
@@ -8,7 +8,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://techjoomla.com</authorUrl>
 	<description />
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<install>
 		<!-- Runs on install -->
 		<sql>