Merged PRs

dolt

4053: Fix racey updates of NomsBlockStore putCount
Found this issue while running tests in the new format with the -race flag enabled in ld. Harmless issue as it is only used in tests.
4049: Dropping a non-pk column that is before a primary key column should be diffable.
Fixes #4037
The ordering of the primary key columns in returned by Schema.GetAllCols() should not determine diffability.
If and only if the primary key tags, their ordinal ordering, and their types (in the new format) are equal, two schemas are diffable.
Schema.GetPkCols() always returns the columns in ordinal order:
https://github.com/dolthub/dolt/blob/ad471682829fc379c95a41eb23f26c00cad0e099/go/libraries/doltcore/schema/schema_test.go#L106-L145
4014: Add a variety of skipped bats tests

3645: Panic in GeometryType.SQL when trying to cast GeometryType to string
4037: dolt diff --summary fails when non-pk column is dropped when it's the first column
4011: As of reach dependent on view commit history