Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
stanislas-m committed May 22, 2020
2 parents 12af063 + 80b9462 commit fcef263
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion genny/fizz/ctable/create_table.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func fizzColType(s string) string {
switch strings.ToLower(s) {
case "int":
return "integer"
case "time", "datetime":
case "time.time", "time", "datetime":
return "timestamp"
case "uuid.uuid", "uuid":
return "uuid"
Expand Down
4 changes: 3 additions & 1 deletion genny/fizz/ctable/create_table_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
func Test_New(t *testing.T) {
r := require.New(t)

ats, err := attrs.ParseArgs("id:uuid", "created_at:timestamp", "updated_at:timestamp", "name", "description:text", "age:int", "bar:nulls.String")
ats, err := attrs.ParseArgs("id:uuid", "created_at:timestamp", "updated_at:timestamp", "name", "description:text", "age:int", "bar:nulls.String", "started_at:time.Time", "finished_at:nulls.Time")
r.NoError(err)

cases := []struct {
Expand Down Expand Up @@ -51,6 +51,8 @@ func Test_New(t *testing.T) {
t.Column("description", "text", {})
t.Column("age", "integer", {})
t.Column("bar", "string", {null: true})
t.Column("started_at", "timestamp", {})
t.Column("finished_at", "timestamp", {null: true})
t.Timestamps()
}`,
},
Expand Down
2 changes: 1 addition & 1 deletion soda/cmd/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cmd

// Version defines the current Pop version.
const Version = "v5.1.2"
const Version = "v5.1.3"

0 comments on commit fcef263

Please sign in to comment.