Skip to content

Commit

Permalink
code coverage cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
araddon committed Oct 28, 2017
1 parent e617b23 commit 9656363
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 19 deletions.
14 changes: 3 additions & 11 deletions exec/ddl.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ var (
_ TaskRunner = (*Create)(nil)
)

// Create is executeable task for SET SQL Create, Alter
// Create is executeable task for SQL Create, Alter, Schema, Source etc.
type Create struct {
*TaskBase
p *plan.Create
}

// NewCommand creates new create exec task
// NewCreate creates new create exec task
func NewCreate(ctx *plan.Context, p *plan.Create) *Create {
m := &Create{
TaskBase: NewTaskBase(ctx),
Expand All @@ -36,21 +36,13 @@ func NewCreate(ctx *plan.Context, p *plan.Create) *Create {

// Close Create
func (m *Create) Close() error {
if err := m.TaskBase.Close(); err != nil {
return err
}
return nil
return m.TaskBase.Close()
}

// Run Create
func (m *Create) Run() error {
defer close(m.msgOutCh)

if m.Ctx.Session == nil {
u.Warnf("no Context.Session?")
return fmt.Errorf("no Context.Session?")
}

cs := m.p.Stmt

switch cs.Tok.T {
Expand Down
12 changes: 7 additions & 5 deletions rel/parse_sql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -633,11 +633,13 @@ func TestWithJson(t *testing.T) {
}
`
req, err := rel.ParseSql(sql)
assert.True(t, err == nil && req != nil, "Must parse: %s \n\t%v", sql, err)
assert.Equal(t, nil, err)
assert.NotEqual(t, nil, req)
sel, ok := req.(*rel.SqlSelect)
assert.True(t, ok, "is SqlSelect: %T", req)
assert.True(t, len(sel.From) == 1 && sel.From[0].Name == "user", "has 1 from: %v", sel.From)
assert.True(t, len(sel.With) == 8, "has with: %v", sel.With)
assert.True(t, len(sel.With.Helper("keyobj")) == 2, "has 2obj keys: %v", sel.With.Helper("keyobj"))
assert.True(t, ok)
assert.Equal(t, 1, len(sel.From))
assert.Equal(t, "user", sel.From[0].Name)
assert.Equal(t, 8, len(sel.With))
assert.Equal(t, 2, len(sel.With.Helper("keyobj")))
u.Infof("sel.With: \n%s", sel.With.PrettyJson())
}
6 changes: 3 additions & 3 deletions schema/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,9 @@ func (m *Schema) refreshSchemaUnlocked() {
}

// AddTable add table to schema.
func (m *Schema) AddTable(tbl *Table) {
m.addTable(tbl)
}
// func (m *Schema) AddTable(tbl *Table) {
// m.addTable(tbl)
// }

func (m *Schema) addTable(tbl *Table) error {

Expand Down

0 comments on commit 9656363

Please sign in to comment.