LBRYCommunity/sqlboiler
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Uniqueidentifier now treated as uuid

Browse source
This commit is contained in:
Sergey Kurt 2017-03-31 11:39:12 +03:00
parent dfbcef7fe3
commit a4ba4b6e9d
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bdb/drivers/mssql.go
View file

@ -313,8 +313,11 @@ func (m *MSSQLDriver) TranslateColumnType(c bdb.Column) bdb.Column {
c.Type = "null.Bytes" c.Type = "null.Bytes"
case "timestamp", "rowversion": case "timestamp", "rowversion":
c.Type = "null.Bytes" c.Type = "null.Bytes"
case "uniqueidentifier", "xml": case "xml":
c.Type = "null.String" c.Type = "null.String"
case "uniqueidentifier":
c.Type = "null.String"
c.DBType = "uuid"
default: default:
c.Type = "null.String" c.Type = "null.String"
} }
@ -342,8 +345,11 @@ func (m *MSSQLDriver) TranslateColumnType(c bdb.Column) bdb.Column {
c.Type = "[]byte" c.Type = "[]byte"
case "timestamp", "rowversion": case "timestamp", "rowversion":
c.Type = "[]byte" c.Type = "[]byte"
case "uniqueidentifier", "xml": case "xml":
c.Type = "string" c.Type = "string"
case "uniqueidentifier":
c.Type = "string"
c.DBType = "uuid"
default: default:
c.Type = "string" c.Type = "string"
} }

8
randomize/randomize.go
View file

@ -52,7 +52,7 @@ var (
rgxValidTime = regexp.MustCompile(`[2-9]+`) rgxValidTime = regexp.MustCompile(`[2-9]+`)
validatedTypes = []string{ validatedTypes = []string{
"inet", "line", "uuid", "uniqueidentifier", "interval", "mediumint", "inet", "line", "uuid", "interval", "mediumint",
"json", "jsonb", "box", "cidr", "circle", "json", "jsonb", "box", "cidr", "circle",
"lseg", "macaddr", "path", "pg_lsn", "point", "lseg", "macaddr", "path", "pg_lsn", "point",
"polygon", "txid_snapshot", "money", "hstore", "polygon", "txid_snapshot", "money", "hstore",
@ -195,7 +195,7 @@ func randomizeField(s *Seed, field reflect.Value, fieldType string, canBeNull bo
field.Set(reflect.ValueOf(value)) field.Set(reflect.ValueOf(value))
return nil return nil
} }
if fieldType == "uuid" || fieldType == "uniqueidentifier" { if fieldType == "uuid" {
value = null.NewString(uuid.NewV4().String(), true) value = null.NewString(uuid.NewV4().String(), true)
field.Set(reflect.ValueOf(value)) field.Set(reflect.ValueOf(value))
return nil return nil
@ -268,7 +268,7 @@ func randomizeField(s *Seed, field reflect.Value, fieldType string, canBeNull bo
field.Set(reflect.ValueOf(value)) field.Set(reflect.ValueOf(value))
return nil return nil
} }
if fieldType == "uuid" || fieldType == "uniqueidentifier" { if fieldType == "uuid" {
value = uuid.NewV4().String() value = uuid.NewV4().String()
field.Set(reflect.ValueOf(value)) field.Set(reflect.ValueOf(value))
return nil return nil
@ -390,7 +390,7 @@ func getArrayRandValue(s *Seed, typ reflect.Type, fieldType string) interface{}
value := strconv.Itoa((s.nextInt()%26)+2) + " days" value := strconv.Itoa((s.nextInt()%26)+2) + " days"
return types.StringArray{value, value} return types.StringArray{value, value}
} }
if fieldType == "uuid" || fieldType == "uniqueidentifier" { if fieldType == "uuid" {
value := uuid.NewV4().String() value := uuid.NewV4().String()
return types.StringArray{value, value} return types.StringArray{value, value}
} }