Allow customize data type via ParseFieldStructForDialect

leeopus · Jan 15, 2017 · a3b8b33 · a3b8b33
1 parent c62e9bc
commit a3b8b33
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/dialect.go b/dialect.go
@@ -68,17 +68,27 @@ func RegisterDialect(name string, dialect Dialect) {
 	dialectsMap[name] = dialect
 }
 
-// ParseFieldStructForDialect parse field struct for dialect
-func ParseFieldStructForDialect(field *StructField) (fieldValue reflect.Value, sqlType string, size int, additionalType string) {
+// ParseFieldStructForDialect get field's sql data type
+var ParseFieldStructForDialect = func(field *StructField, dialect Dialect) (fieldValue reflect.Value, sqlType string, size int, additionalType string) {
 	// Get redirected field type
-	var reflectType = field.Struct.Type
+	var (
+		reflectType = field.Struct.Type
+		dataType    = field.TagSettings["TYPE"]
+	)
+
 	for reflectType.Kind() == reflect.Ptr {
 		reflectType = reflectType.Elem()
 	}
 
 	// Get redirected field value
 	fieldValue = reflect.Indirect(reflect.New(reflectType))
 
+	if gormDataType, ok := fieldValue.Interface().(interface {
+		GormDataType(Dialect) string
+	}); ok {
+		dataType = gormDataType.GormDataType(dialect)
+	}
+
 	// Get scanner's real value
 	var getScannerValue func(reflect.Value)
 	getScannerValue = func(value reflect.Value) {
@@ -102,5 +112,5 @@ func ParseFieldStructForDialect(field *StructField) (fieldValue reflect.Value, s
 		additionalType = additionalType + " DEFAULT " + value
 	}
 
-	return fieldValue, field.TagSettings["TYPE"], size, strings.TrimSpace(additionalType)
+	return fieldValue, dataType, size, strings.TrimSpace(additionalType)
 }
diff --git a/dialect_common.go b/dialect_common.go
@@ -39,8 +39,8 @@ func (commonDialect) Quote(key string) string {
 	return fmt.Sprintf(`"%s"`, key)
 }
 
-func (commonDialect) DataTypeOf(field *StructField) string {
-	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field)
+func (s *commonDialect) DataTypeOf(field *StructField) string {
+	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field, s)
 
 	if sqlType == "" {
 		switch dataValue.Kind() {

diff --git a/dialect_mysql.go b/dialect_mysql.go
@@ -27,8 +27,8 @@ func (mysql) Quote(key string) string {
 }
 
 // Get Data Type for MySQL Dialect
-func (mysql) DataTypeOf(field *StructField) string {
-	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field)
+func (s *mysql) DataTypeOf(field *StructField) string {
+	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field, s)
 
 	// MySQL allows only one auto increment column per table, and it must
 	// be a KEY column.

diff --git a/dialect_postgres.go b/dialect_postgres.go
@@ -23,8 +23,8 @@ func (postgres) BindVar(i int) string {
 	return fmt.Sprintf("$%v", i)
 }
 
-func (postgres) DataTypeOf(field *StructField) string {
-	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field)
+func (s *postgres) DataTypeOf(field *StructField) string {
+	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field, s)
 
 	if sqlType == "" {
 		switch dataValue.Kind() {

diff --git a/dialect_sqlite3.go b/dialect_sqlite3.go
@@ -21,8 +21,8 @@ func (sqlite3) GetName() string {
 }
 
 // Get Data Type for Sqlite Dialect
-func (sqlite3) DataTypeOf(field *StructField) string {
-	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field)
+func (s *sqlite3) DataTypeOf(field *StructField) string {
+	var dataValue, sqlType, size, additionalType = ParseFieldStructForDialect(field, s)
 
 	if sqlType == "" {
 		switch dataValue.Kind() {

diff --git a/dialects/mssql/mssql.go b/dialects/mssql/mssql.go
@@ -44,8 +44,8 @@ func (mssql) Quote(key string) string {
 	return fmt.Sprintf(`"%s"`, key)
 }
 
-func (mssql) DataTypeOf(field *gorm.StructField) string {
-	var dataValue, sqlType, size, additionalType = gorm.ParseFieldStructForDialect(field)
+func (s *mssql) DataTypeOf(field *gorm.StructField) string {
+	var dataValue, sqlType, size, additionalType = gorm.ParseFieldStructForDialect(field, s)
 
 	if sqlType == "" {
 		switch dataValue.Kind() {