Skip to content
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.

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

*: improve the column info for client #4770

Merged
merged 9 commits into from
Oct 15, 2017
Merged

*: improve the column info for client #4770

merged 9 commits into from
Oct 15, 2017

Conversation

XuHuaiyu
Copy link
Contributor

fix #4660
PTAL @coocood @hanfei1991 @breeswish

@shenli
Copy link
Member

shenli commented Oct 13, 2017

/run-all-tests

@coocood
Copy link
Member

coocood commented Oct 13, 2017

LGTM

@XuHuaiyu
Copy link
Contributor Author

fix #4773

@XuHuaiyu
Copy link
Contributor Author

/run-integration-common-test
/run-common-test

@XuHuaiyu
Copy link
Contributor Author

/run-all-test

@XuHuaiyu
Copy link
Contributor Author

PTAL @shenli @coocood

zz-jason
zz-jason previously approved these changes Oct 15, 2017
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -1644,6 +1644,22 @@ func (s *testSuite) TestColumnName(c *C) {
c.Check(len(fields), Equals, 2)
c.Check(fields[0].Column.Name.L, Equals, "d")
c.Check(fields[1].Column.Name.L, Equals, "c")
rs, err = tk.Exec("select c as a from t as t2")
Copy link
Member

Choose a reason for hiding this comment

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

Add comment for your test case to explain the purpose of the test.

@@ -115,7 +115,9 @@ func (s *Schema) FindColumnAndIndex(astCol *ast.ColumnName) (*Column, int, error
if idx == -1 {
idx = i
} else {
return nil, -1, errors.Errorf("Column %s is ambiguous", col.String())
if !col.IsAggOrSubq {
Copy link
Member

Choose a reason for hiding this comment

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

Add comment here.

@XuHuaiyu
Copy link
Contributor Author

PTAL @shenli

@shenli
Copy link
Member

shenli commented Oct 15, 2017

LGTM

@shenli
Copy link
Member

shenli commented Oct 15, 2017

/run-all-tests

@shenli shenli merged commit a34964a into master Oct 15, 2017
@shenli shenli deleted the xhy/navicat branch October 15, 2017 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

OrgTable & Schema is missing from ResultField, causes Navicat disabling edit tables
4 participants