16 Commits

Author	SHA1	Message	Date
jennifersp	6886a8721f	commit merge if no conflict (#4105)	2022-08-23 12:38:12 -07:00
Zach Musgrave	3e547e256b	Fixed bats tests that were using reserved words that needed quoting	2022-08-09 11:24:30 -07:00
Dhruv Sringari	a724a2d56b	[no-release-notes] rewrite dolt conflicts cat to use sql path (#3756) ... * add our_diff_type and their_diff_type to dolt_conflicts_table_name * pr comments * rewrite dolt conflicts cat to use sql path * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * cleanup * [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh * add smoke test for conflict cat Co-authored-by: druvv <druvv@users.noreply.github.com>	2022-07-05 15:08:10 -07:00
Dhruv Sringari	24cac1f6c4	[no-release-notes] unskip more bats (#3737) ... * Fix merge test for __DOLT_1__ * tree.ThreeWayMerge always calls callback when key collision occurs * add keyless support for new format merge and other merge related tables * newline of doom * unskip more bats * empty * skip blame.bats and remotes-aws.bats	2022-07-01 17:00:42 -07:00
Daylon Wilkins	178259995b	Unskipped bats tests	2022-06-21 04:03:39 -07:00
Andy Arthur	242793c0e9	two more skips	2022-05-10 15:01:20 -07:00
Andy Arthur	01587c8c20	more BATS skips for __DOLT_1__	2022-05-10 14:08:47 -07:00
Zach Musgrave	0a11d1d89c	Removed --disable-batch flag from all bats tests	2022-01-25 11:52:04 -08:00
James Cor	f71072a438	fixed test that expects error from fixing already deleted conflict	2021-11-23 14:09:34 -08:00
James Cor	d13e7c1ec8	no longer expect errors for selecting from empty conflicts table	2021-11-23 12:25:24 -08:00
James Cor	f560f27561	another one	2021-11-22 17:03:08 -08:00
Dustin Brown	5371ed510f	/integration-tests/bats: fix bats tests	2021-09-23 14:30:43 -07:00
Andy Arthur	4a83a6e1ea	bats test	2021-07-15 14:31:05 -07:00
Zach Musgrave	5d9c4d7821	Fixed the sql-conflicts tests	2021-07-04 20:01:39 -07:00
Brian Hendriks	daa3d27d8d	panic fix for 0 rows resolved (#1471) ... * fix panic that occurs when a delete query against a conflict table affects 0 rows * bats test for 0 conflict delete * formatting * fixes	2021-03-23 14:16:31 -07:00
Dustin Brown	61b06450b1	/integration-tests: move bats	2021-03-15 14:04:40 -07:00