dolt/integration-tests at v0.40.8 - dolt - Gitea

mirror of https://github.com/dolthub/dolt.git synced 2026-01-17 18:50:25 -06:00

Files

Dhruv Sringari b1a972dd31 [no-release-notes] store conflicts in unified merge artifacts table (#3579 )

* Add Hash160Enc

* persist and read conflicts from merge artifacts table

* update some tests

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

* comment / cleanup prolly/artifact_map.go

* ~copyright~

* reskip TestDoltMerge

* rename Hash160Enc to Address

* change ArtifactType from string to uint8

* fix zero value for ArtifactType

Co-authored-by: druvv <druvv@users.noreply.github.com>

2022-06-09 13:07:47 -07:00

bats

[no-release-notes] store conflicts in unified merge artifacts table (#3579 )

2022-06-09 13:07:47 -07:00

compatibility

Fixed compatility test with new schema output

2021-11-19 17:40:45 -08:00

data-dump-loading-tests

support SRID value in column definition (#3457 )

2022-05-31 21:02:22 -07:00

mysql-client-tests

CALL DOLT_MERGE now returns fast_forward and conflicts status columns (#3564 )