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.

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

Jump to bottom

dml : fix last insert id when autoid specified by user in first row. #11973

Merged
merged 9 commits into from
Sep 2, 2019
Merged

dml : fix last insert id when autoid specified by user in first row. #11973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b296e6f
fix last insert id when autoid specified by user in first row
AilinKid Sep 2, 2019
7d12501
add insert test
AilinKid Sep 2, 2019
34d696b
fix test
AilinKid Sep 2, 2019
c861aa9
fix test
AilinKid Sep 2, 2019
db7b04c
fix test
AilinKid Sep 2, 2019
ae5698a
fix test
AilinKid Sep 2, 2019
e7c276f
find load data bug
AilinKid Sep 2, 2019
670b21b
rebase the load data rowCount bug fix
AilinKid Sep 2, 2019
6a00cb7
Merge branch 'master' into fix_last_insert_id
lonng Sep 2, 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
5 changes: 3 additions & 2 deletions executor/insert_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,8 +570,9 @@ func (e *InsertValues) adjustAutoIncrementDatum(ctx context.Context, d types.Dat
if e.filterErr(err) != nil {
return types.Datum{}, err
}
// It's compatible with mysql. So it sets last insert id to the first row.
if e.rowCount == 1 {
// It's compatible with mysql setting the first allocated autoID to lastInsertID.
// Cause autoID may be specified by user, judge only the first row is not suitable.
if e.lastInsertID == 0 {
e.lastInsertID = uint64(recordID)
}
}
Expand Down
16 changes: 16 additions & 0 deletions executor/insert_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,22 @@ func (s *testSuite3) TestInsertWithAutoidSchema(c *C) {
`select * from t1 where id = 9`,
testkit.Rows(`9 9`),
},
// test last insert id
{
`insert into t1 values(3000, -1), (null, -2)`,
`select * from t1 where id = 3000`,
testkit.Rows(`3000 -1`),
},
{
`;`,
`select * from t1 where id = 3001`,
testkit.Rows(`3001 -2`),
},
{
`;`,
`select last_insert_id()`,
testkit.Rows(`3001`),
},
{
`insert into t2(id, n) values(1, 1)`,
`select * from t2 where id = 1`,
Expand Down