Merged PRs
dolt
- 11076: More revert dirty-set rules to sync with git
Git will rejectrevertwhen there is anything staged, regardless of conflicts or not in the changed. This change makes dolt follow the same pattern.
Related: #11073 - 11074: go/store/nbs: journal.go: Fix a bug which could result in broken databases after a process crash.
If Dolt crashed immediately after creating an empty journal file, and before it wrote the initial set-root record to it, then the next time Dolt ran it would treat the root of the database as0000....
This could also happen for certain observed filesystem states after an operating system crash. - 11072: go/store/nbs: Delete the in-flight table file in (*fileTablePersister).writeAndProtect when we experience an error on the write.
Leaving it behind needlessly wastes disk space. It will never be usable and is in an indeterminate state.
This is currently relevant even when FatalBehaviorFatal, because Conjoin's write is currently allowed to fail before we take the hard dependency on it. There are still some I/O errors which leave the file behind, including a failure at ftp.Open(). - 11063: Tests for IndexedJsonDocument.Compare
When an IndexedJsonDocument compares a sql.JsonDocument of a different type, it falls back to using Json.Compare. This PR adds tests to ensure that the two implementations match. - 10775: Fix open Dependabot security alerts
Upgrade golang.org/x/image v0.18.0 -> v0.38.0 to address CVE for out-of-memory via crafted TIFF file. Upgrade @mikro-orm/core and @mikro-orm/mysql from v5 to v6.6.10+ to address critical SQL injection and high-severity prototype pollution vulnerabilities.