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:
  

  dolt/go/libraries/doltcore/schema/schema_test.go

  Lines 106 to 145 in ad47168

  	func TestSetPkOrder(t *testing.T) {
  	// GetPkCols() should always return columns in ordinal order
  	// GetAllCols() should always return columns in the defined schema's order
  	t.Run("returns the correct GetPkCols() order", func(t *testing.T) {
  	allColColl := NewColCollection(allCols...)
  	pkColColl := NewColCollection(pkCols...)
  	sch, err := SchemaFromCols(allColColl)
  	require.NoError(t, err)
  	require.Equal(t, allColColl, sch.GetAllCols())
  	require.Equal(t, pkColColl, sch.GetPKCols())
  	err = sch.SetPkOrdinals([]int{1, 0})
  	require.NoError(t, err)
  	expectedPkColColl := NewColCollection(pkCols[1], pkCols[0])
  	require.Equal(t, expectedPkColColl, sch.GetPKCols())
  	require.Equal(t, allColColl, sch.GetAllCols())
  	})
  	t.Run("Can round-trip", func(t *testing.T) {
  	allColColl := NewColCollection(allCols...)
  	pkColColl := NewColCollection(pkCols...)
  	sch, err := SchemaFromCols(allColColl)
  	require.NoError(t, err)
  	require.Equal(t, allColColl, sch.GetAllCols())
  	require.Equal(t, pkColColl, sch.GetPKCols())
  	err = sch.SetPkOrdinals([]int{1, 0})
  	require.NoError(t, err)
  	err = sch.SetPkOrdinals([]int{0, 1})
  	require.NoError(t, err)
  	require.Equal(t, allColColl, sch.GetAllCols())
  	require.Equal(t, pkColColl, sch.GetPKCols())
  	})
  	}

• 4014: Add a variety of skipped bats tests

Closed Issues

• 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