Commit Graph

13248 Commits

Author SHA1 Message Date
Vinai Rachakonda
a4e28fa5b5 Support the bulk edit accumulator for dolt table import (#3591) 2022-06-14 13:28:23 -04:00
LiuLiu
40843d17f2 Merge pull request #3606 from dolthub/get-branches-by-root-hash
Get branches by root hash
2022-06-14 10:13:24 -07:00
James Cor
4c00d4e1b7 Merge pull request #3611 from dolthub/james/geometry
fixing panic when creating a polygon with more than one linestring
2022-06-14 10:02:09 -07:00
Dustin Brown
285ca3434b [no-release-notes] /integration-tests: rm elixir mysql test (#3609) 2022-06-13 22:18:03 -04:00
James Cor
5776756342 * -> + 2022-06-13 16:57:07 -07:00
liuliu-dev
3ef9799c44 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-13 21:55:52 +00:00
liuliu
3894eb92e3 conflict 2022-06-13 14:54:23 -07:00
liuliu
f7bc50bd02 rename, test 2022-06-13 14:51:48 -07:00
liuliu-dev
5791252ea5 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-13 21:38:13 +00:00
Dhruv Sringari
06947de821 [no-release-notes] merge sets of conflicts together (#3586)
* 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

* merge sets of conflicts together, update some tests

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

* pr comments

* skip cv test

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-06-13 14:37:23 -07:00
liuliu
39a3214bd6 Merge remote-tracking branch 'origin/main' into get-branches-by-root-hash 2022-06-13 14:19:18 -07:00
liuliu
99333a5187 get branches by root hash 2022-06-13 14:18:01 -07:00
Tim Sehn
571611b149 Update README.md 2022-06-13 12:23:49 -07:00
Tim Sehn
84a5bc2c00 Merge pull request #3597 from dolthub/tim/new-readme
Modified README to be more "database version control"-centric
2022-06-13 12:22:55 -07:00
AndyA
d6e20ab406 Merge pull request #3602 from dolthub/andy/dolt-1-enginetests
[no-release-notes] Unskip more enginetests for `__DOLT_1__`
2022-06-13 12:01:20 -07:00
Andy Arthur
000797e081 unskip DoltDiffQueryPlan tests 2022-06-13 11:25:43 -07:00
Andy Arthur
ed9f10073c unskip DoltMultiSessionBehavior 2022-06-13 11:17:08 -07:00
Andy Arthur
76e200ac87 unskip some transaction tests 2022-06-13 10:57:33 -07:00
Andy Arthur
ef78adafc0 unskipping working enginetests 2022-06-13 10:42:30 -07:00
Daylon Wilkins
07f617e87a Simplified types, removed some type checks, fixed SELECT output 2022-06-11 19:06:41 -07:00
max-hoffman
fb52c4a4cc [ga-bump-release] Update Dolt version to 0.40.9 and release v0.40.9 v0.40.9 2022-06-11 03:51:27 +00:00
Dustin Brown
a7f2f8e144 [ga-bump-dep] Bump dependency in Dolt by andrew-wm-arthur (#3596)
Co-authored-by: andrew-wm-arthur <andy@dolthub.com>
2022-06-10 20:41:21 -07:00
Timothy Sehn
26f08cd870 Add images 2022-06-10 15:27:29 -07:00
Tim Sehn
bee8457cd3 Modified README to be more database version control centric 2022-06-10 15:18:53 -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
AndyA
26202309de Merge pull request #3582 from dolthub/andy/new-format-query-plans
[no-release-notes] /doltcore/sqle/enginetest: Added alternative query plans for `__DOLT_1__`
2022-06-10 13:18:12 -07:00
Andy Arthur
7991df4bc8 Merge remote-tracking branch 'origin/main' into andy/new-format-query-plans 2022-06-10 12:47:09 -07:00
James Cor
92050790f4 Merge pull request #3548 from dolthub/james/local-user
[no-release-notes] only create privilege file, when specified with option
2022-06-10 11:01:53 -07:00
James Cor
7df5f69d96 using older gms so things pass 2022-06-10 10:22:03 -07:00
James Cor
919ff8ccdd wrong go mod 2022-06-10 10:14:57 -07:00
James Cor
933162d046 merge 2022-06-10 10:10:09 -07:00
andrew-wm-arthur
c7d8ee7f16 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-10 16:08:43 +00:00
Andy Arthur
f8939a430a revert to earlier GMS 2022-06-10 09:07:28 -07:00
Andy Arthur
d73a075175 Merge remote-tracking branch 'origin/main' into andy/new-format-query-plans 2022-06-10 09:03:07 -07:00
max-hoffman
a78718e632 [ga-bump-release] Update Dolt version to 0.40.8 and release v0.40.8 v0.40.8 2022-06-10 02:10:36 +00:00
Dustin Brown
7956df46da [ga-bump-dep] Bump dependency in Dolt by max-hoffman (#3585)
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com>
2022-06-09 18:55:44 -07:00
coffeegoddd
343636abc3 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-09 22:38:16 +00:00
James Cor
ca9d6fa7ac updating go mod 2022-06-09 15:33:42 -07:00
Andy Arthur
12bbdd3d56 Merge branch 'andy/new-format-query-plans' of github.com:dolthub/dolt into andy/new-format-query-plans 2022-06-09 15:23:55 -07:00
Andy Arthur
0f8069032f pr feedback 2022-06-09 15:23:18 -07:00
James Cor
5017964042 can persist tovalid 2022-06-09 15:03:21 -07:00
James Cor
5caecc4c2c fixing test 2022-06-09 14:18:34 -07:00
James Cor
99237e0bb4 testing gomod 2022-06-09 14:11:36 -07:00
James Cor
132cfa2a9b working? 2022-06-09 14:10:29 -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
andrew-wm-arthur
3a6280a6b3 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-09 19:42:12 +00:00
Andy Arthur
3d557f1fd9 added alternative enginetest query plans for nbf __DOLT_1__ 2022-06-09 12:38:07 -07:00
Brian Hendriks
8a25c0df66 dolt backup sync-url (#3580)
* dolt backup sync-url
2022-06-08 21:49:02 -07:00
AndyA
5f5cce4603 Merge pull request #3577 from dolthub/andy/unskip-enginetests
[no-release-notes] doltcore/sqle/enginetest: Unskip some new format enginetests
2022-06-08 20:29:53 -07:00
VinaiRachakonda
bd30184c08 [ga-bump-release] Update Dolt version to 0.40.7 and release v0.40.7 v0.40.7 2022-06-09 03:21:04 +00:00