diff --git a/common/config_test.go b/common/config_test.go
index 8d7f253a6f71b4e53e5047811c994e29873814fb..ba141dfd873f513ad92d77dfb305702ddb5d0bc3 100644
--- a/common/config_test.go
+++ b/common/config_test.go
@@ -65,6 +65,7 @@ func TestParseDSN(t *testing.T) {
 	var dsns = []string{
 		"",
 		"user:password@hostname:3307/database",
+		"user:password@hostname:3307/database?charset=utf8",
 		"user:password@hostname:3307",
 		"user:password@hostname:/database",
 		"user:password@:3307/database",
diff --git a/common/meta.go b/common/meta.go
index 1b2882991c79ac696ded2f3f826be58f2a1acc1a..c92b01b0d9767a83f9d6f632316302ff39c8171a 100644
--- a/common/meta.go
+++ b/common/meta.go
@@ -217,13 +217,20 @@ func GetDataTypeLength(dataType string) []int {
 		dataLength := dataType[si+1:]
 		if ei := strings.Index(dataLength, ")"); ei > 0 {
 			dataLength = dataLength[:ei]
-			for _, l := range strings.Split(dataLength, ",") {
-				v, err := strconv.Atoi(l)
-				if err != nil {
-					Log.Debug("GetDataTypeLength() Error: %v", err)
-					return []int{-1}
+			if strings.HasPrefix(dataType, "enum") ||
+				strings.HasPrefix(dataType, "set") {
+				// set('one', 'two'), enum('G','PG','PG-13','R','NC-17')
+				length = []int{len(strings.Split(dataLength, ","))}
+			} else {
+				// char(10), varchar(10)
+				for _, l := range strings.Split(dataLength, ",") {
+					v, err := strconv.Atoi(l)
+					if err != nil {
+						Log.Debug("GetDataTypeLength() Error: %v", err)
+						return []int{-1}
+					}
+					length = append(length, v)
 				}
-				length = append(length, v)
 			}
 		}
 	}
@@ -482,13 +489,12 @@ func StringStorageReq(dataType string, charset string) int {
 			return typeLength[0]*bysPerChar + 1
 		}
 		return typeLength[0]*bysPerChar + 2
-
 	case "enum":
 		// 1 or 2 bytes, depending on the number of enumeration values (65,535 values maximum)
-		return 2
+		return typeLength[0]/(2^15) + 1
 	case "set":
 		// 1, 2, 3, 4, or 8 bytes, depending on the number of set members (64 members maximum)
-		return 8
+		return typeLength[0]/8 + 1
 	default:
 		return 0
 	}
diff --git a/common/meta_test.go b/common/meta_test.go
index 1b4ebc711a9e7227b07284d773c39a8f6bd243b5..d64e3c6dcdd080f865bd0ab25d6fb4c0f59d7ad8 100644
--- a/common/meta_test.go
+++ b/common/meta_test.go
@@ -17,6 +17,7 @@
 package common
 
 import (
+	"fmt"
 	"testing"
 )
 
@@ -142,3 +143,31 @@ func TestGetDataBytes(t *testing.T) {
 	}
 	Log.Debug("Exiting function: %s", GetFunctionName())
 }
+
+func TestStringStorageReq(t *testing.T) {
+	Log.Debug("Entering function: %s", GetFunctionName())
+	dataTypes := []string{
+		"char(10)",
+		"char(256)",
+		"binary(10)",
+		"binary(256)",
+		"varchar(10)",
+		"varbinary(10)",
+		"enum('G','PG','PG-13','R','NC-17')",
+		"set('one', 'two')",
+		// wrong case
+		"not_exist",
+		"char(-1)",
+	}
+	err := GoldenDiff(func() {
+		for name, _ := range CharSets {
+			for _, tp := range dataTypes {
+				fmt.Println(tp, name, StringStorageReq(tp, name))
+			}
+		}
+	}, t.Name(), update)
+	if err != nil {
+		t.Error(err)
+	}
+	Log.Debug("Exiting function: %s", GetFunctionName())
+}
diff --git a/common/testdata/TestParseDSN.golden b/common/testdata/TestParseDSN.golden
index e558b46e0fa0cea408945d7a084400f6675edc38..56c8fe7859420dd4623e5dd902c28a8aa0a4e337 100644
--- a/common/testdata/TestParseDSN.golden
+++ b/common/testdata/TestParseDSN.golden
@@ -1,5 +1,6 @@
 (*common.Dsn)(nil)
 &common.Dsn{Net:"", Addr:"hostname:3307", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
+&common.Dsn{Net:"", Addr:"hostname:3307", Schema:"database", User:"user", Password:"password", Charset:"utf8", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
 &common.Dsn{Net:"", Addr:"hostname:3307", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
 &common.Dsn{Net:"", Addr:"hostname:3306", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
 &common.Dsn{Net:"", Addr:"127.0.0.1:3307", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
diff --git a/common/testdata/TestStringStorageReq.golden b/common/testdata/TestStringStorageReq.golden
new file mode 100644
index 0000000000000000000000000000000000000000..939278d879aae64e10c8bbd1ff4753caaf0cfae0
--- /dev/null
+++ b/common/testdata/TestStringStorageReq.golden
@@ -0,0 +1,369 @@
+char(10) cp1250 10
+char(256) cp1250 255
+binary(10) cp1250 10
+binary(256) cp1250 255
+varchar(10) cp1250 11
+varbinary(10) cp1250 11
+enum('G','PG','PG-13','R','NC-17') cp1250 1
+set('one', 'two') cp1250 1
+not_exist cp1250 0
+char(10) cp932 20
+char(256) cp932 510
+binary(10) cp932 10
+binary(256) cp932 255
+varchar(10) cp932 21
+varbinary(10) cp932 21
+enum('G','PG','PG-13','R','NC-17') cp932 1
+set('one', 'two') cp932 1
+not_exist cp932 0
+char(10) gb2312 20
+char(256) gb2312 510
+binary(10) gb2312 10
+binary(256) gb2312 255
+varchar(10) gb2312 21
+varbinary(10) gb2312 21
+enum('G','PG','PG-13','R','NC-17') gb2312 1
+set('one', 'two') gb2312 1
+not_exist gb2312 0
+char(10) latin1 10
+char(256) latin1 255
+binary(10) latin1 10
+binary(256) latin1 255
+varchar(10) latin1 11
+varbinary(10) latin1 11
+enum('G','PG','PG-13','R','NC-17') latin1 1
+set('one', 'two') latin1 1
+not_exist latin1 0
+char(10) utf32 40
+char(256) utf32 1020
+binary(10) utf32 10
+binary(256) utf32 255
+varchar(10) utf32 41
+varbinary(10) utf32 41
+enum('G','PG','PG-13','R','NC-17') utf32 1
+set('one', 'two') utf32 1
+not_exist utf32 0
+char(10) latin5 10
+char(256) latin5 255
+binary(10) latin5 10
+binary(256) latin5 255
+varchar(10) latin5 11
+varbinary(10) latin5 11
+enum('G','PG','PG-13','R','NC-17') latin5 1
+set('one', 'two') latin5 1
+not_exist latin5 0
+char(10) latin7 10
+char(256) latin7 255
+binary(10) latin7 10
+binary(256) latin7 255
+varchar(10) latin7 11
+varbinary(10) latin7 11
+enum('G','PG','PG-13','R','NC-17') latin7 1
+set('one', 'two') latin7 1
+not_exist latin7 0
+char(10) big5 20
+char(256) big5 510
+binary(10) big5 10
+binary(256) big5 255
+varchar(10) big5 21
+varbinary(10) big5 21
+enum('G','PG','PG-13','R','NC-17') big5 1
+set('one', 'two') big5 1
+not_exist big5 0
+char(10) cp1257 10
+char(256) cp1257 255
+binary(10) cp1257 10
+binary(256) cp1257 255
+varchar(10) cp1257 11
+varbinary(10) cp1257 11
+enum('G','PG','PG-13','R','NC-17') cp1257 1
+set('one', 'two') cp1257 1
+not_exist cp1257 0
+char(10) dec8 10
+char(256) dec8 255
+binary(10) dec8 10
+binary(256) dec8 255
+varchar(10) dec8 11
+varbinary(10) dec8 11
+enum('G','PG','PG-13','R','NC-17') dec8 1
+set('one', 'two') dec8 1
+not_exist dec8 0
+char(10) hebrew 10
+char(256) hebrew 255
+binary(10) hebrew 10
+binary(256) hebrew 255
+varchar(10) hebrew 11
+varbinary(10) hebrew 11
+enum('G','PG','PG-13','R','NC-17') hebrew 1
+set('one', 'two') hebrew 1
+not_exist hebrew 0
+char(10) koi8u 10
+char(256) koi8u 255
+binary(10) koi8u 10
+binary(256) koi8u 255
+varchar(10) koi8u 11
+varbinary(10) koi8u 11
+enum('G','PG','PG-13','R','NC-17') koi8u 1
+set('one', 'two') koi8u 1
+not_exist koi8u 0
+char(10) latin2 10
+char(256) latin2 255
+binary(10) latin2 10
+binary(256) latin2 255
+varchar(10) latin2 11
+varbinary(10) latin2 11
+enum('G','PG','PG-13','R','NC-17') latin2 1
+set('one', 'two') latin2 1
+not_exist latin2 0
+char(10) macce 10
+char(256) macce 255
+binary(10) macce 10
+binary(256) macce 255
+varchar(10) macce 11
+varbinary(10) macce 11
+enum('G','PG','PG-13','R','NC-17') macce 1
+set('one', 'two') macce 1
+not_exist macce 0
+char(10) sjis 20
+char(256) sjis 510
+binary(10) sjis 10
+binary(256) sjis 255
+varchar(10) sjis 21
+varbinary(10) sjis 21
+enum('G','PG','PG-13','R','NC-17') sjis 1
+set('one', 'two') sjis 1
+not_exist sjis 0
+char(10) tis620 10
+char(256) tis620 255
+binary(10) tis620 10
+binary(256) tis620 255
+varchar(10) tis620 11
+varbinary(10) tis620 11
+enum('G','PG','PG-13','R','NC-17') tis620 1
+set('one', 'two') tis620 1
+not_exist tis620 0
+char(10) ucs2 20
+char(256) ucs2 510
+binary(10) ucs2 10
+binary(256) ucs2 255
+varchar(10) ucs2 21
+varbinary(10) ucs2 21
+enum('G','PG','PG-13','R','NC-17') ucs2 1
+set('one', 'two') ucs2 1
+not_exist ucs2 0
+char(10) utf8 30
+char(256) utf8 765
+binary(10) utf8 10
+binary(256) utf8 255
+varchar(10) utf8 31
+varbinary(10) utf8 31
+enum('G','PG','PG-13','R','NC-17') utf8 1
+set('one', 'two') utf8 1
+not_exist utf8 0
+char(10) armscii8 10
+char(256) armscii8 255
+binary(10) armscii8 10
+binary(256) armscii8 255
+varchar(10) armscii8 11
+varbinary(10) armscii8 11
+enum('G','PG','PG-13','R','NC-17') armscii8 1
+set('one', 'two') armscii8 1
+not_exist armscii8 0
+char(10) euckr 20
+char(256) euckr 510
+binary(10) euckr 10
+binary(256) euckr 255
+varchar(10) euckr 21
+varbinary(10) euckr 21
+enum('G','PG','PG-13','R','NC-17') euckr 1
+set('one', 'two') euckr 1
+not_exist euckr 0
+char(10) keybcs2 10
+char(256) keybcs2 255
+binary(10) keybcs2 10
+binary(256) keybcs2 255
+varchar(10) keybcs2 11
+varbinary(10) keybcs2 11
+enum('G','PG','PG-13','R','NC-17') keybcs2 1
+set('one', 'two') keybcs2 1
+not_exist keybcs2 0
+char(10) ascii 10
+char(256) ascii 255
+binary(10) ascii 10
+binary(256) ascii 255
+varchar(10) ascii 11
+varbinary(10) ascii 11
+enum('G','PG','PG-13','R','NC-17') ascii 1
+set('one', 'two') ascii 1
+not_exist ascii 0
+char(10) binary 10
+char(256) binary 255
+binary(10) binary 10
+binary(256) binary 255
+varchar(10) binary 11
+varbinary(10) binary 11
+enum('G','PG','PG-13','R','NC-17') binary 1
+set('one', 'two') binary 1
+not_exist binary 0
+char(10) cp1251 10
+char(256) cp1251 255
+binary(10) cp1251 10
+binary(256) cp1251 255
+varchar(10) cp1251 11
+varbinary(10) cp1251 11
+enum('G','PG','PG-13','R','NC-17') cp1251 1
+set('one', 'two') cp1251 1
+not_exist cp1251 0
+char(10) utf8mb4 40
+char(256) utf8mb4 1020
+binary(10) utf8mb4 10
+binary(256) utf8mb4 255
+varchar(10) utf8mb4 41
+varbinary(10) utf8mb4 41
+enum('G','PG','PG-13','R','NC-17') utf8mb4 1
+set('one', 'two') utf8mb4 1
+not_exist utf8mb4 0
+char(10) cp852 10
+char(256) cp852 255
+binary(10) cp852 10
+binary(256) cp852 255
+varchar(10) cp852 11
+varbinary(10) cp852 11
+enum('G','PG','PG-13','R','NC-17') cp852 1
+set('one', 'two') cp852 1
+not_exist cp852 0
+char(10) koi8r 10
+char(256) koi8r 255
+binary(10) koi8r 10
+binary(256) koi8r 255
+varchar(10) koi8r 11
+varbinary(10) koi8r 11
+enum('G','PG','PG-13','R','NC-17') koi8r 1
+set('one', 'two') koi8r 1
+not_exist koi8r 0
+char(10) cp866 10
+char(256) cp866 255
+binary(10) cp866 10
+binary(256) cp866 255
+varchar(10) cp866 11
+varbinary(10) cp866 11
+enum('G','PG','PG-13','R','NC-17') cp866 1
+set('one', 'two') cp866 1
+not_exist cp866 0
+char(10) eucjpms 30
+char(256) eucjpms 765
+binary(10) eucjpms 10
+binary(256) eucjpms 255
+varchar(10) eucjpms 31
+varbinary(10) eucjpms 31
+enum('G','PG','PG-13','R','NC-17') eucjpms 1
+set('one', 'two') eucjpms 1
+not_exist eucjpms 0
+char(10) gb18030 40
+char(256) gb18030 1020
+binary(10) gb18030 10
+binary(256) gb18030 255
+varchar(10) gb18030 41
+varbinary(10) gb18030 41
+enum('G','PG','PG-13','R','NC-17') gb18030 1
+set('one', 'two') gb18030 1
+not_exist gb18030 0
+char(10) hp8 10
+char(256) hp8 255
+binary(10) hp8 10
+binary(256) hp8 255
+varchar(10) hp8 11
+varbinary(10) hp8 11
+enum('G','PG','PG-13','R','NC-17') hp8 1
+set('one', 'two') hp8 1
+not_exist hp8 0
+char(10) swe7 10
+char(256) swe7 255
+binary(10) swe7 10
+binary(256) swe7 255
+varchar(10) swe7 11
+varbinary(10) swe7 11
+enum('G','PG','PG-13','R','NC-17') swe7 1
+set('one', 'two') swe7 1
+not_exist swe7 0
+char(10) greek 10
+char(256) greek 255
+binary(10) greek 10
+binary(256) greek 255
+varchar(10) greek 11
+varbinary(10) greek 11
+enum('G','PG','PG-13','R','NC-17') greek 1
+set('one', 'two') greek 1
+not_exist greek 0
+char(10) macroman 10
+char(256) macroman 255
+binary(10) macroman 10
+binary(256) macroman 255
+varchar(10) macroman 11
+varbinary(10) macroman 11
+enum('G','PG','PG-13','R','NC-17') macroman 1
+set('one', 'two') macroman 1
+not_exist macroman 0
+char(10) ujis 30
+char(256) ujis 765
+binary(10) ujis 10
+binary(256) ujis 255
+varchar(10) ujis 31
+varbinary(10) ujis 31
+enum('G','PG','PG-13','R','NC-17') ujis 1
+set('one', 'two') ujis 1
+not_exist ujis 0
+char(10) utf16le 40
+char(256) utf16le 1020
+binary(10) utf16le 10
+binary(256) utf16le 255
+varchar(10) utf16le 41
+varbinary(10) utf16le 41
+enum('G','PG','PG-13','R','NC-17') utf16le 1
+set('one', 'two') utf16le 1
+not_exist utf16le 0
+char(10) cp1256 10
+char(256) cp1256 255
+binary(10) cp1256 10
+binary(256) cp1256 255
+varchar(10) cp1256 11
+varbinary(10) cp1256 11
+enum('G','PG','PG-13','R','NC-17') cp1256 1
+set('one', 'two') cp1256 1
+not_exist cp1256 0
+char(10) cp850 10
+char(256) cp850 255
+binary(10) cp850 10
+binary(256) cp850 255
+varchar(10) cp850 11
+varbinary(10) cp850 11
+enum('G','PG','PG-13','R','NC-17') cp850 1
+set('one', 'two') cp850 1
+not_exist cp850 0
+char(10) gbk 20
+char(256) gbk 510
+binary(10) gbk 10
+binary(256) gbk 255
+varchar(10) gbk 21
+varbinary(10) gbk 21
+enum('G','PG','PG-13','R','NC-17') gbk 1
+set('one', 'two') gbk 1
+not_exist gbk 0
+char(10) geostd8 10
+char(256) geostd8 255
+binary(10) geostd8 10
+binary(256) geostd8 255
+varchar(10) geostd8 11
+varbinary(10) geostd8 11
+enum('G','PG','PG-13','R','NC-17') geostd8 1
+set('one', 'two') geostd8 1
+not_exist geostd8 0
+char(10) utf16 40
+char(256) utf16 1020
+binary(10) utf16 10
+binary(256) utf16 255
+varchar(10) utf16 41
+varbinary(10) utf16 41
+enum('G','PG','PG-13','R','NC-17') utf16 1
+set('one', 'two') utf16 1
+not_exist utf16 0