836 Commits

Author SHA1 Message Date
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
Brian Hendriks 8a25c0df66 dolt backup sync-url (#3580)
* dolt backup sync-url
2022-06-08 21:49:02 -07:00
Vinai Rachakonda 9cf4557c64 Support bit types on import (#3570) 2022-06-08 22:49:52 -04:00
Zach Musgrave 72521b1465 Merge main 2022-06-08 10:30:20 -07:00
Zach Musgrave c7f77ea3d9 unskip another test 2022-06-08 10:10:05 -07:00
Zach Musgrave e2e2a4d4f2 Unskip a bunch of tests 2022-06-08 10:08:04 -07:00
Aaron Son b67f4aadb6 Merge pull request #3525 from dolthub/aaron/datas-storeroot-uses-prolly-tree
[no-release-notes] go: Convert RefMap usage in datas, durable, doltdb to prolly.AddressMap.
2022-06-07 20:40:08 -07:00
Dhruv Sringari 6488344abb CALL DOLT_MERGE now returns fast_forward and conflicts status columns (#3564)
* CALL DOLT_MERGE now returns fast_forward and conflicts columns

* fix tests

* fix sql integration tests

* fix sql-merge.bats

* pr comment
2022-06-07 17:03:46 -07:00
jennifersp 841b294841 add bats test for procedure alias not showing in information_schema.routines table (#3554) 2022-06-07 15:56:07 -07:00
Aaron Son df73a69cd5 go/cmd/dolt/commands: roots.go: Fix for __DOLT_{DEV,1}__. 2022-06-07 14:45:20 -07:00
Tim Sehn 06218a4a51 Merge pull request #3538 from dolthub/zachmu/bats-unskip
Unskip newly working bats tests
2022-06-06 16:48:04 -07:00
Jason Fulghum 6819aabcc3 Adding a test with no global configuration set. 2022-06-06 15:20:59 -07:00
Jason Fulghum 5983e5ec36 Bug fix for not saving explicitly specified name and email settings to local configuration.
Fixes: https://github.com/dolthub/dolt/issues/3546
2022-06-06 11:57:43 -07:00
Zach Musgrave 9b1c5fd9ef Unskip newly working bats tests 2022-06-03 14:01:02 -07:00
Zach Musgrave e4801cd6b9 Merge pull request #3526 from dolthub/zachmu/temp-tables
[no-release-notes] Fixed temp tables in new format, unskipped tests
2022-06-03 10:07:38 -07:00
Zach Musgrave 5f44a8d127 Fixed temporary tables in new format 2022-06-02 17:12:05 -07:00
Jason Fulghum f8c817dcc2 Merge branch 'main' into fulghum/dolt_branch 2022-06-02 16:22:40 -07:00
James Cor 8411e9c33f Merge pull request #3439 from dolthub/james/local-user
Grant access to `mysql` database when in dolt shell
2022-06-02 16:03:12 -07:00
Zach Musgrave aefffd170c Fixed test (old behavior wasn't changing the case of the column name when asked, now behaves correctly) 2022-06-02 11:18:29 -07:00
Zach Musgrave ca8b4180f2 Added some skipped tests for type conversion errors on column modify 2022-06-02 11:02:13 -07:00
Zach Musgrave 9a0278db35 Fixed bug in changing column type but not kind in new format 2022-06-02 09:14:09 -07:00
Zach Musgrave 7f4d72e28a Skip panicking type change bats test for new format 2022-06-01 16:33:38 -07:00
Zach Musgrave 7ab93cdc67 Revert bats change 2022-06-01 15:05:50 -07:00
Zach Musgrave ca5d9f8a77 Merge main 2022-06-01 13:40:06 -07:00
Aaron Son 011776cc6b Merge pull request #3506 from dolthub/aaron/dbfactory-aws-load-shared-config
go/libraries/doltcore/dbfactory: aws.go: Load shared config by default, instead of requiring the user to set AWS_SDK_LOAD_CONFIG=1.
2022-06-01 09:50:21 -07:00
jennifersp d9bb364c42 case sensitivity for database and branch names 2022-05-31 21:51:23 -07:00
jennifersp eb0577eb96 support SRID value in column definition (#3457) 2022-05-31 21:02:22 -07:00
Jason Fulghum 1b4b79fafe Merge branch 'main' into fulghum/dolt_branch 2022-05-31 14:04:04 -07:00
Dhruv Sringari 8b00e78e64 go/libraries/doltcore/merge: allow merges in an inconsistent state (#3460)
* add bats test to check that merges can succeed in a conflicted state


fix tests

* add skipped bats for merges that violate check constraints post-merge

* add types.UnionMaps

* caller can choose value when key collision occurs

* fix comment

* allow merges when conflicts or violations are committed

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

* skip bats on new format

* enginetest -> queries

* last bats fix

* more bats

* missing run in bats

* pr edits

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-05-31 13:19:52 -07:00
Aaron Son 92e7bec109 integration-tests/bats/remotes-aws.bats: Fix test name to indicated _without_ AWS_SDK_LOAD_CONFIG=1. 2022-05-31 11:21:22 -07:00
Aaron Son a55d2be986 go/libraries/doltcore/dbfactory: aws.go: Load shared config by default, instead of requiring the user to set AWS_SDK_LOAD_CONFIG=1. 2022-05-31 10:10:10 -07:00
Zach Musgrave 510431d096 Who knew that bash functions couldn't be empty 2022-05-28 10:38:45 -07:00
Zach Musgrave 48aa83d0f4 Upgrade gms and unskip all bats to see what's still broken 2022-05-27 14:53:18 -07:00
Jason Fulghum e42664d821 Merge branch 'main' into fulghum/dolt_branch 2022-05-26 16:37:00 -07:00
coffeegoddd aded369797 /integration-tests/mysql-client-tests/mysql-client-tests.bats: use python3.8 2022-05-26 12:38:20 -07:00
coffeegoddd 08cd284ef5 /integration-tests/{MySQL,ORM}Dockerfile: add platform args, fix python and pip version 2022-05-26 12:03:45 -07:00
Jason Fulghum cb64dea1ed Updating sql-branch BATS tests now that dolt_branch supports renaming and deleting branches in SQL. 2022-05-25 15:39:29 -07:00
James Cor ed840e19bf updated tests 2022-05-24 15:08:16 -07:00
James Cor 83b47ce74b merge and adding default file path 2022-05-24 14:51:05 -07:00
James Cor 64c2c6377a forgot new user 2022-05-24 12:21:19 -07:00
James Cor 92fbb02b03 adding restart for persistence, and skipping all for windows 2022-05-24 11:49:00 -07:00
James Cor ffa6ac9df3 feedback + testing if unskippable on windows 2022-05-24 10:25:00 -07:00
James Cor e5c15a2933 Merge branch 'main' into james/mysql 2022-05-24 10:07:50 -07:00
Maximilian Hoffman 4a994d31c6 Read replica update working set fixes (#3471)
* Read replica update working set fixes

Read replica pull updates the session working set after pulling a
filtered set of branches from the tracking database. The original
(buggy) implementation updates the working set to the branch specified
at server-start time. The identity of that branch was fixed for the
duration of the server, so dolt_checkout would (appear to) have no
effect on the new branch's working set. What actually happened was more
pernicious: the working set was updated to the value of the
incorrect branch.

The fix no longer statically sets the active branch for a read replica
database. The active branch is pulled from the `*sql.Context`, so the
correct working set will be updated.

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

* add test

* todos

* delete extraeneous line

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2022-05-23 15:00:11 -07:00
James Cor 8ec24e92f4 renaming privileges 2022-05-23 14:52:17 -07:00
James Cor 6dbd84ddf7 run cat 2022-05-23 14:44:48 -07:00
James Cor c9ff614995 i need a space????? 2022-05-23 14:35:47 -07:00
James Cor 53b7ea6c1a ??? 2022-05-23 14:27:17 -07:00
James Cor a88351f5d6 working tests probably 2022-05-23 14:12:03 -07:00
James Cor 9cb4b5285b finally 2022-05-23 14:01:22 -07:00