From 2cec4ea6b4c41ed64b6d14e5345eb5ee73c90291 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 22 Jan 2021 01:01:58 +0900
Subject: [PATCH] Clean up utf8mb4 setting in default table schema

---
 common/framework/parsers/dbtableparser.php            | 4 ++++
 modules/module/schemas/module_config.xml              | 2 +-
 modules/module/schemas/module_part_config.xml         | 2 +-
 modules/module/schemas/sites.xml                      | 4 ++--
 modules/spamfilter/schemas/spamfilter_denied_ip.xml   | 4 ++--
 modules/spamfilter/schemas/spamfilter_denied_word.xml | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/common/framework/parsers/dbtableparser.php b/common/framework/parsers/dbtableparser.php
index aa91b9c49..70f303b13 100644
--- a/common/framework/parsers/dbtableparser.php
+++ b/common/framework/parsers/dbtableparser.php
@@ -87,6 +87,10 @@ class DBTableParser extends BaseParser
 			{
 				$column->charset = toBool($attribs['utf8mb4']) ? 'utf8mb4' : 'utf8';
 			}
+			elseif ($column->xetype === 'date' || ($column->name === 'ipaddress' && $column->size >= 60))
+			{
+				$column->charset = 'latin1';
+			}
 			
 			// Get the default value.
 			if (isset($attribs['default']))
diff --git a/modules/module/schemas/module_config.xml b/modules/module/schemas/module_config.xml
index 975867345..3f6667764 100644
--- a/modules/module/schemas/module_config.xml
+++ b/modules/module/schemas/module_config.xml
@@ -1,5 +1,5 @@
 <table name="module_config">
-    <column name="module" type="varchar" size="80" notnull="notnull" primary_key="primary_key" />
+    <column name="module" type="varchar" size="80" notnull="notnull" primary_key="primary_key" charset="latin1" />
     <column name="site_srl" type="number" size="11" notnull="notnull" />
     <column name="config" type="bigtext" />
     <column name="regdate" type="date" />
diff --git a/modules/module/schemas/module_part_config.xml b/modules/module/schemas/module_part_config.xml
index b677f6471..88e8e78ba 100644
--- a/modules/module/schemas/module_part_config.xml
+++ b/modules/module/schemas/module_part_config.xml
@@ -1,5 +1,5 @@
 <table name="module_part_config">
-    <column name="module" type="varchar" size="80" notnull="notnull" unique="unique_module_part_config" utf8mb4="false" />
+    <column name="module" type="varchar" size="80" notnull="notnull" unique="unique_module_part_config" charset="latin1" />
     <column name="module_srl" type="number" size="11" notnull="notnull" unique="unique_module_part_config" />
     <column name="config" type="bigtext" />
     <column name="regdate" type="date" />
diff --git a/modules/module/schemas/sites.xml b/modules/module/schemas/sites.xml
index b3a797cf2..b21981281 100644
--- a/modules/module/schemas/sites.xml
+++ b/modules/module/schemas/sites.xml
@@ -1,7 +1,7 @@
 <table name="sites">
     <column name="site_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="index_module_srl" type="number" size="11" default="0" />
-    <column name="domain" type="varchar" size="255" notnull="notnull" unique="unique_domain" utf8mb4="false" />
-    <column name="default_language" type="varchar" size="255" />
+    <column name="domain" type="varchar" size="191" notnull="notnull" unique="unique_domain" />
+    <column name="default_language" type="varchar" size="191" />
     <column name="regdate" type="date" />
 </table>
diff --git a/modules/spamfilter/schemas/spamfilter_denied_ip.xml b/modules/spamfilter/schemas/spamfilter_denied_ip.xml
index 758053734..8235ed25b 100644
--- a/modules/spamfilter/schemas/spamfilter_denied_ip.xml
+++ b/modules/spamfilter/schemas/spamfilter_denied_ip.xml
@@ -1,7 +1,7 @@
 <table name="spamfilter_denied_ip">
-    <column name="ipaddress" type="varchar" size="60" utf8mb4="false" notnull="notnull" primary_key="primary_key" />
+    <column name="ipaddress" type="varchar" size="60" notnull="notnull" primary_key="primary_key" />
     <column name="hit" type="number" notnull="notnull" default="0" index="idx_hit" />
     <column name="latest_hit" type="date" index="idx_latest_hit" />
-    <column name="description" type="varchar" size="255" />
+    <column name="description" type="varchar" size="191" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/spamfilter/schemas/spamfilter_denied_word.xml b/modules/spamfilter/schemas/spamfilter_denied_word.xml
index 749f30d45..80ae26195 100644
--- a/modules/spamfilter/schemas/spamfilter_denied_word.xml
+++ b/modules/spamfilter/schemas/spamfilter_denied_word.xml
@@ -1,5 +1,5 @@
 <table name="spamfilter_denied_word">
-    <column name="word" type="varchar" size="180" utf8mb4="false" notnull="notnull" primary_key="primary_key" />
+    <column name="word" type="varchar" size="100" notnull="notnull" primary_key="primary_key" />
     <column name="hit" type="number" notnull="notnull" default="0" index="idx_hit" />
     <column name="latest_hit" type="date" index="idx_latest_hit" />
     <column name="regdate" type="date" index="idx_regdate" />