fix: Normalize PKs to not null#13557
Merged
kodiakhq[bot] merged 2 commits intocloudquery:mainfrom Sep 1, 2023
Merged
Conversation
Member
Author
|
Ah, for some reason those tests are passing locally for me |
Member
Author
|
Tests fixed in a429640 |
| plugin.WriterTestSuiteTests{ | ||
| SafeMigrations: plugin.SafeMigrations{ | ||
| AddColumn: true, | ||
| AddColumnNotNull: false, |
Contributor
There was a problem hiding this comment.
I think it just needs the true options, the false is the default.
| func (c *Client) normalizeTable(table *schema.Table) *schema.Table { | ||
| columns := make([]schema.Column, len(table.Columns)) | ||
| for i, col := range table.Columns { | ||
| if col.PrimaryKey { |
Contributor
There was a problem hiding this comment.
Maybe just col.NotNull = col.NotNull || col.PrimaryKey ?
candiduslynx
reviewed
Sep 1, 2023
| columns := make([]schema.Column, len(table.Columns)) | ||
| for i, col := range table.Columns { | ||
| // In MySQL primary keys are implicitly not null | ||
| col.NotNull = col.NotNull || col.PrimaryKey |
Contributor
There was a problem hiding this comment.
I'm a bit worried that we modify column here instead of working on the copy.
Could we move it to
normalizedCol := schema.NewColumnFromArrowField(*normalized)
normalizedCol.NotNull = normalizedCol.NotNull || normalizedCol.PrimaryKey
columns[i] = normalizedColor something similar?
Member
Author
There was a problem hiding this comment.
Cleaned up the PR. Also thought about removing the conversion to arrow and back to column, but probably safer to keep it so we remove any non relevant column fields.
Also moved the tests change to #13565
8bf0482 to
a43b486
Compare
candiduslynx
approved these changes
Sep 1, 2023
| Name: field.Name, | ||
| Type: normalizedType, | ||
| Nullable: field.Nullable, | ||
| Nullable: !notNull, |
Contributor
There was a problem hiding this comment.
Suggested change
| Nullable: !notNull, | |
| Nullable: !(col.NotNull || col.PrimaryKey), // In MySQL primary keys are implicitly not null |
Comment on lines
+33
to
+34
| // In MySQL primary keys are implicitly not null | ||
| notNull := col.NotNull || col.PrimaryKey |
Contributor
There was a problem hiding this comment.
Suggested change
| // In MySQL primary keys are implicitly not null | |
| notNull := col.NotNull || col.PrimaryKey |
kodiakhq bot
pushed a commit
that referenced
this pull request
Sep 1, 2023
🤖 I have created a release *beep* *boop* --- ## [3.0.5](plugins-destination-mysql-v3.0.4...plugins-destination-mysql-v3.0.5) (2023-09-01) ### Bug Fixes * **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.6.0 ([#13492](#13492)) ([c305876](c305876)) * Normalize PKs to not null ([#13557](#13557)) ([2230538](2230538)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Summary
Saw this while working on #13486. If you run migration twice on the same spec it fails. The reason is that MySQL Implicitly sets PKs to non null in the DB, so we have to account for that.
We had this in the code and it seems it got lost in the migration to v3 or v4.
I also cleaned up the tests as those are passing without that loop on test options.Tests cleanup moved to #13565Not sure why the double migration tests didn't catch this