Skip to content

fix trim sql #804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yancey0623 merged 4 commits into from
Sep 11, 2019
Merged

fix trim sql #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef45abf
fix trim sql
Yancey0623 Sep 10, 2019
f76218f
Merge branch 'develop' of https://github.com/sql-machine-learning/sql…
Yancey0623 Sep 10, 2019
cf02779
Merge branch 'develop' of https://github.com/sql-machine-learning/sql…
Yancey0623 Sep 11, 2019
27bcd9e
add test with trimed sql
Yancey0623 Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/sqlflowserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (s *Server) Run(req *pb.Request, stream pb.SQLFlow_RunServer) error {
sqlStatements := strings.Split(req.Sql, ";")
trimedStatements := []string{}
for _, singleSQL := range sqlStatements {
sqlToRun := strings.Trim(singleSQL, "\n")
sqlToRun := strings.TrimSpace(singleSQL)
Copy link
Copy Markdown
Collaborator

@typhoonzero typhoonzero Sep 10, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe \n also need to be trimmed?

Copy link
Copy Markdown
Collaborator Author

@Yancey0623 Yancey0623 Sep 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strings.TrimSpace can trim \n and space: https://golang.org/pkg/strings/#TrimSpace

if sqlToRun == "" {
continue
}
Expand Down
15 changes: 10 additions & 5 deletions server/sqlflowserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,11 @@ import (
)

const (
testErrorSQL = "ERROR ..."
testQuerySQL = "SELECT ..."
testExecuteSQL = "INSERT ..."
testExtendedSQL = "SELECT ... TRAIN ..."
testErrorSQL = "ERROR ..."
testQuerySQL = "SELECT ..."
testExecuteSQL = "INSERT ..."
testExtendedSQL = "SELECT ... TRAIN ..."
testExtendedSQLWithSpace = "SELECT ... TRAIN ...; \n\t"
)

var testServerAddress string
Expand Down Expand Up @@ -67,6 +68,8 @@ func mockRun(sql string, db *sf.DB, modelDir string, session *pb.Session) *sf.Pi
case testExtendedSQL:
wr.Write("log 0")
wr.Write("log 1")
default:
wr.Write(fmt.Errorf("unexcepted SQL: %s", sql))
}
}()
return rd
Expand Down Expand Up @@ -123,7 +126,9 @@ func TestSQL(t *testing.T) {
_, err = stream.Recv()
a.Equal(status.Error(codes.Unknown, fmt.Sprintf("run error: %v", testErrorSQL)), err)

for _, s := range []string{testQuerySQL, testExecuteSQL, testExtendedSQL} {
testMultipleSQL := fmt.Sprintf("%s; %s", testQuerySQL, testExtendedSQL)

for _, s := range []string{testQuerySQL, testExecuteSQL, testExtendedSQL, testExtendedSQLWithSpace, testMultipleSQL} {
stream, err := c.Run(ctx, &pb.Request{Sql: s})
a.NoError(err)
for {
Expand Down