octoleo/gh-ost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Supporting JSON types

Browse Source
This commit is contained in:
Shlomi Noach 2017-08-22 11:51:20 +03:00
parent a43796d5c5
commit 2174588ebf
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
go/logic/inspect.go
View File

@ -545,6 +545,11 @@ func (this *Inspector) applyColumnTypes(databaseName, tableName string, columnsL
columnsList.GetColumn(columnName).Type = sql.DateTimeColumnType columnsList.GetColumn(columnName).Type = sql.DateTimeColumnType
} }
} }
if strings.Contains(columnType, "json") {
for _, columnsList := range columnsLists {
columnsList.GetColumn(columnName).Type = sql.JSONColumnType
}
}
if strings.HasPrefix(columnType, "enum") { if strings.HasPrefix(columnType, "enum") {
for _, columnsList := range columnsLists { for _, columnsList := range columnsLists {
columnsList.GetColumn(columnName).Type = sql.EnumColumnType columnsList.GetColumn(columnName).Type = sql.EnumColumnType

4
go/sql/builder.go
View File

@ -38,6 +38,8 @@ func buildColumnsPreparedValues(columns *ColumnList) []string {
var token string var token string
if column.timezoneConversion != nil { if column.timezoneConversion != nil {
token = fmt.Sprintf("convert_tz(?, '%s', '%s')", column.timezoneConversion.ToTimezone, "+00:00") token = fmt.Sprintf("convert_tz(?, '%s', '%s')", column.timezoneConversion.ToTimezone, "+00:00")
} else if column.Type == JSONColumnType {
token = "convert(? using utf8mb4)"
} else { } else {
token = "?" token = "?"
} }
@ -106,6 +108,8 @@ func BuildSetPreparedClause(columns *ColumnList) (result string, err error) {
var setToken string var setToken string
if column.timezoneConversion != nil { if column.timezoneConversion != nil {
setToken = fmt.Sprintf("%s=convert_tz(?, '%s', '%s')", EscapeName(column.Name), column.timezoneConversion.ToTimezone, "+00:00") setToken = fmt.Sprintf("%s=convert_tz(?, '%s', '%s')", EscapeName(column.Name), column.timezoneConversion.ToTimezone, "+00:00")
} else if column.Type == JSONColumnType {
setToken = fmt.Sprintf("%s=convert(? using utf8mb4)", EscapeName(column.Name))
} else { } else {
setToken = fmt.Sprintf("%s=?", EscapeName(column.Name)) setToken = fmt.Sprintf("%s=?", EscapeName(column.Name))
} }

1
go/sql/types.go
View File

@ -20,6 +20,7 @@ const (
DateTimeColumnType = iota DateTimeColumnType = iota
EnumColumnType = iota EnumColumnType = iota
MediumIntColumnType = iota MediumIntColumnType = iota
JSONColumnType = iota
) )
const maxMediumintUnsigned int32 = 16777215 const maxMediumintUnsigned int32 = 16777215