mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-20 17:20:43 -05:00
Code Issues Packages Projects Releases 149 Wiki Activity
16,463 Commits 176 Branches 619 Tags
41ee83b94baacd56d2bfd95fb7216e00a1892a97
Commit Graph

10062 Commits

Author SHA1 Message Date
James Cor
41ee83b94b restoring engine test file 2022-12-13 12:46:30 -08:00
James Cor
62821cd5c7 making hashof implement sql.FunctionExpression 2022-12-13 12:44:48 -08:00
James Cor
6e35e1ebe7 Merge branch 'main' into james/test 2022-12-13 12:34:52 -08:00
Maximilian Hoffman
24544035bc Systab edits (#4974) 
* edit

* no median or variance

* revert readme edit

* Edits

* edits

* all read/write tests
 2022-12-12 18:46:12 -08:00
Pavel Safronov
8ce3fd5bbb Merge pull request #4971 from dolthub/pavel/reset-branch-after-checkout 
Reset source branch after checkout
 2022-12-12 16:44:56 -08:00
andy-wm-arthur
e34bd2062b [ga-bump-release] Update Dolt version to 0.51.12 and release v0.51.12 2022-12-12 23:45:53 +00:00
Dhruv Sringari
4f4d11879b Merge pull request #4973 from dolthub/dhruv/fix-missing-ws 
Fix working set not found error for dolt migrate
 2022-12-12 15:29:10 -08:00
Pavel Safronov
7542ebee47 PR feedback: minor change to documentation. 2022-12-12 15:20:45 -08:00
Pavel Safronov
750384d131 PR feedback: headRef shouldn't be passed as a reference, updating. 2022-12-12 15:11:54 -08:00
Pavel Safronov
2ff347a45e PR feedback: added some comments to ResetHard. 2022-12-12 14:11:27 -08:00
Dhruv Sringari
cbea3a205d Fix working set not found error for dolt migrate 
In dolt versions <= 0.26.10, a working set was not created when a branch was created.
In newer dolt versions it is created. Migrate expected a working set to exist for every branch ref.

Now, if a working set is missing we pretend it exists.
 2022-12-12 13:26:34 -08:00
James Cor
4a85923a1f bump again 2022-12-12 12:52:17 -08:00
AndyA
ffa6a56fae Merge pull request #4967 from dolthub/andy/filter-branch-tags 
go/commands: `filter-branch --all` now rewrites tags, added `--branches` flag
 2022-12-12 12:47:34 -08:00
James Cor
1183e1c59e skipping dev tests 2022-12-12 12:45:37 -08:00
James Cor
0c9030b726 fixing commit filters 2022-12-12 12:27:02 -08:00
JCOR11599
ce5f23c4de [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-12-12 19:53:22 +00:00
James Cor
93e9f34168 bump 2022-12-12 11:51:41 -08:00
James Cor
3cec8790f0 more skips 2022-12-12 11:50:44 -08:00
James Cor
803bca6138 fail for prepareds 2022-12-12 11:47:52 -08:00
PavelSafronov
1cc8a7bb79 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-12-12 19:33:14 +00:00
Pavel Safronov
dcf0225e7f When checking out a branch, clear the source branch's working set only after the destination checkout succeeds without errors. 2022-12-12 11:24:58 -08:00
Pavel Safronov
d75b45c151 Merge pull request #4941 from dolthub/pavel/dolt-4863 
Block branch switches when both branches have working set changes
 2022-12-12 10:59:26 -08:00
Aaron Son
ce25b9c900 Merge pull request #4970 from dolthub/aaron/conjoin-ctx-not-canceled 
go/store/nbs: conjoiner.go: Fix bug with use of canceled context.
 2022-12-12 10:47:28 -08:00
Aaron Son
e85e7bd9c4 go/store/nbs: conjoiner.go: Fix bug with use of canceled context. 2022-12-12 10:26:33 -08:00
James Cor
ec463e9cb1 bump 2022-12-12 02:01:36 -08:00
Andy Arthur
aa74695e37 filter-branch --all now rewrites tags, added --branches flag 2022-12-09 15:42:12 -08:00
Pavel Safronov
a0cf04c848 PR feedback: 
- use various equivalent commands in BATS tests
- test a scenario where the source branch has no working set, but the destination branch does
- reset source branch only if working set is present
- go back to ignoring an error
 2022-12-09 14:57:21 -08:00
Maximilian Hoffman
cde420a5cb [no-release-notes] systab bench edits (#4964) 
* edit

* no median or variance

* revert readme edit
 2022-12-09 14:15:05 -08:00
Max Hoffman
6748bdae99 restore all systab CI tests 2022-12-09 11:59:01 -08:00
PavelSafronov
7b3ee05ae2 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-12-09 18:32:54 +00:00
Pavel Safronov
ebf279f673 Starting to check errors that we were previously ignoring. 
Doing a reset on the source branch when switching branches.
Updated tests to verify all scenarios.
 2022-12-09 10:31:36 -08:00
Maximilian Hoffman
7b473fd892 new sysbench runner and CI for systab (#4942) 
* prototype for new sysbench runner

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

* CI jobs

* edits

* nightly and release workflows

* param tweaks

* testing edits

* fixes

* fix test

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
 2022-12-09 09:50:45 -08:00
Hydrocharged
d79f7f8e3e [ga-bump-release] Update Dolt version to 0.51.11 and release v0.51.11 2022-12-09 05:15:31 +00:00
AndyA
d158e3de26 Merge pull request #4958 from dolthub/andy/filter-branch-verbose 
go/commands: added verbose mode to filter-branch
 2022-12-08 20:59:36 -08:00
Daylon Wilkins
163dc1f329 Skipped test sometimes returning wrong result in GitHub actions 2022-12-08 19:59:09 -08:00
Daylon Wilkins
ee650e660d GMS bump 2022-12-08 19:21:30 -08:00
Pavel Safronov
33de38503d PR feedback: 
- added verbose error text for `checkout` to the commands package
- changed checkout error text
- changed anonymous inner functions to standard functions
- adding the discussed scenarios to checkout.bats
 2022-12-08 17:12:04 -08:00
Andy Arthur
d1cfe20554 s/Println/Printf/ 2022-12-08 16:30:04 -08:00
Andy Arthur
fe91033676 go/commands: added verbose mode to filter-branch 2022-12-08 16:16:56 -08:00
fulghum
5679693c3b [ga-bump-dep] Bump dependency in Dolt by fulghum 2022-12-08 17:17:13 +00:00
max-hoffman
23b10e17c0 [ga-bump-release] Update Dolt version to 0.51.10 and release v0.51.10 2022-12-08 03:52:28 +00:00
Dustin Brown
037a2d0c1e [ga-bump-dep] Bump dependency in Dolt by max-hoffman (#4946) 
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com>
 2022-12-07 19:39:17 -08:00
Aaron Son
d920f89ca2 go/cmd/dolt: sqlserver: yaml_config.go: Make some structs public to better support programmatic config generation. 2022-12-07 14:09:52 -08:00
Pavel Safronov
08df38c417 Reworked the logic that checks working sets for conflicts, no longer blocking checkout if working sets cannot be retrieved. 2022-12-07 13:38:22 -08:00
jennifersp
d88393713e support push.autoSetupRemote config variable (#4937) 2022-12-07 10:49:15 -08:00
Pavel Safronov
c2136a3e09 Block branch switches when both current and target branches have working set changes. 
Allow this behavior to be skipped using the `-f` flag, in which case the two working sets are combined (as is the current behavior).
 2022-12-06 16:43:26 -08:00
Andy Arthur
c46c63d695 go/cmd/commands: added --datasets flag to dolt branch to list all datasets 2022-12-06 15:50:08 -08:00
Maximilian Hoffman
bd32265cc1 ambyii's escape commit tag (#4939) 
* no newlines

* Get uncommitted values for GC from datasets

* Remove getGCKeepers

* [no-release-notes] revert systab debugging (#4918)

* Revert "no newlines"

This reverts commit a41db014cc.

* Revert "indent error"

This reverts commit f074dee15d.

* Revert "starter (#4912)"

This reverts commit 02809af1b9.

* Fix and tests for escaping commit messages

Co-authored-by: Taylor Bantle <taylor@dolthub.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurrahmaaniqbal@hotmail.com>
 2022-12-06 15:13:54 -08:00
JCOR11599
761b0bbe28 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2022-12-06 20:14:33 +00:00
JCPrice0024
e04d4d8422 found another minor bug in results.go 
Documented behavior
 2022-12-05 17:34:37 -05:00