Commit Graph

853 Commits

Author SHA1 Message Date
Daylon Wilkins 07f617e87a Simplified types, removed some type checks, fixed SELECT output 2022-06-11 19:06:41 -07:00
Maximilian Hoffman e1ba5fd063 new enginetests for prep asof (#3592)
* new enginetests for prep asof

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

* different fix

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2022-06-10 14:12:18 -07:00
James Cor 933162d046 merge 2022-06-10 10:10:09 -07:00
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
James Cor 18b040b754 working? 2022-06-08 14:46:08 -07:00
James Cor e798cb7958 Merge branch 'main' into james/local-user 2022-06-08 13:41:18 -07:00
James Cor 399f6087eb ????????????? 2022-06-08 12:57:58 -07:00
James Cor 7aaeddd2fb a 2022-06-08 12:20:22 -07:00
James Cor a3497f621e aaaaaaaaa 2022-06-08 11:45:53 -07:00
James Cor 83a66ed481 fixing? 2022-06-08 11:02:00 -07:00
Zach Musgrave 72521b1465 Merge main 2022-06-08 10:30:20 -07:00
James Cor b5f667b270 adding test case 2022-06-08 10:15:43 -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
James Cor 37e2acffe7 tests 2022-06-08 10:07:09 -07:00
James Cor 7404b6a583 fixing tests 2022-06-08 10:02:58 -07:00
James Cor 55fca10d2a fixing tests 2022-06-08 00:16:08 -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
James Cor 00b6d19dd2 Merge branch 'main' into james/local-user 2022-06-07 13:32:37 -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
James Cor 6b14afaee9 asdfasdf 2022-06-06 13:17:30 -07:00
James Cor 09dd30e113 fixing tests 2022-06-06 12:55:39 -07:00
James Cor 93d5966b2d fixing bats tests 2022-06-06 12:16:33 -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