-
-
Notifications
You must be signed in to change notification settings - Fork 192
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
Add diff-with-file option to copy command #729
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good, thanks! we do need some more testing though - a test that shows that all corner cases are handled as expected:
- same tile data
- a tile is added
- a tile is deleted
We may, as a separate PR, also want the mbtiles apply-diff src_file.mbtiles diff.mbtiles dst_file.mbtiles
- but no rush on this
P.S. There is a merge conflict - you may want to simply delete and re-create the lock file after you fix the cargo.toml file merge. |
@nyurik all of these test cases are addressed by diffing
|
d2efcab
to
1f22f86
Compare
fb82fc4
to
1ffa712
Compare
The failing test is caused by the fact that the CI pipeline doesn't install |
agree, lets comment out the apply test in the test.sh for now. Eventually i would still like to have it as part of the test suite - this way our documentation always stays correct (i.e. we can always guarantee that we can apply the delta directly with sqlite3) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good, one minor nit (in addition to commenting out the call to sqlite3). BTW, you may want to add a "TODO: " comment - to only re-enable it once sqlite3 is installed on windows CI (and possibly mac?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p.s. feel free to merge it once it passes the ci
02537a3
to
d9b3f41
Compare
d9b3f41
to
4497005
Compare
This is mostly a noop, just updating to the new way of storing cached queries and a few other changes per https://github.com/launchbadge/sqlx/blob/main/CHANGELOG.md#070---2023-06-30 Note that this uses some of the code from #729 (thanks @upsicleclown !) A minor unrelated change - a reformat of `martin/release.toml`
--diff-with-file
to thecopy
tool