allow adding new primary key to table with > 1 row iff it has auto_increment #1343
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zachmu
reviewed
Oct 21, 2022
sql/plan/alter_table.go
Outdated
| @@ -491,6 +491,12 @@ func (i *addColumnIter) rewriteTable(ctx *sql.Context, rwt sql.RewritableTable) | |||
|
|
|||
| rowIter := sql.NewTableRowIter(ctx, rwt, partitions) | |||
|
|
|||
| var autoTbl sql.AutoIncrementTable | |||
| if newSch.HasAutoIncrement() { | |||
| autoTbl = rwt.(sql.AutoIncrementTable) | |||
There was a problem hiding this comment.
This will panic if the interface doesn't match, always use the two-param version
zachmu
approved these changes
Oct 21, 2022
sql/plan/alter_table.go
Outdated
| } | ||
| autoTbl = t | ||
| } | ||
| idx := newSch.IndexOf(i.a.column.Name, i.a.column.Source) |
sql/plan/alter_table.go
Outdated
| @@ -504,6 +514,14 @@ func (i *addColumnIter) rewriteTable(ctx *sql.Context, rwt sql.RewritableTable) | |||
| return false, err | |||
| } | |||
|
|
|||
| if autoTbl != nil { | |||
| val, err := autoTbl.GetNextAutoIncrementValue(ctx, newRow[idx]) | |||
There was a problem hiding this comment.
This is a really inefficient way to do this. Get this value once, before the loop, and then increment it inside the loop
| ) | ||
| }) | ||
|
|
||
| t.Run("Add primary key column with auto increment first", func(t *testing.T) { |
There was a problem hiding this comment.
according to this warning, mysql plans on deprecating auto_increment float, do you still want me to add a test?
MySQL > alter table t add column pk float primary key auto_increment;
Query OK, 0 rows affected, 1 warning (0.0405 sec)
Records: 0 Duplicates: 0 Warnings: 1
Warning (code 3856): AUTO_INCREMENT support for FLOAT/DOUBLE columns is deprecated and will be removed in a future release. Consider removing AUTO_INCREMENT from column 'pk'.There was a problem hiding this comment.
We support it in dolt (and in GMS) so we should have a test for it
enginetest/enginetests.go
Outdated
| @@ -4996,6 +4996,80 @@ func TestAddDropPks(t *testing.T, harness Harness) { | |||
| {1, 1}, | |||
| }, nil, nil) | |||
| }) | |||
|
|
|||
| if _, ok := harness.(*MemoryHarness); ok { | |||
There was a problem hiding this comment.
Don't skip like this. Engine tests should always be harness agnostic.
Make a new test method called TestAddAutoIncrementColumn and skip it from memory_engine_test.go
added 2 commits
October 21, 2022 15:29
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix for: dolthub/dolt#4581
tests in dolt because
memory.Tabledoesn't implementRewriteableTabledolthub/dolt#4593