Commit Graph

4892 Commits

Author SHA1 Message Date
jennifersp 6f64e0ae98 add --author flag to merge (#4296) 2022-09-09 14:49:44 -07:00
AndyA bfb4c2132d Merge pull request #4297 from dolthub/andy/cleanup-prolly
[no-release-notes] Cleanup packages `prolly`, `tree`
2022-09-08 19:21:41 -07:00
Aaron Son 509accded5 SQL: DOLT_CHECKOUT: Support checking out a branch which does not have an associated working set. 2022-09-08 16:33:02 -07:00
Andy Arthur 949967f267 refactored pkg prolly to remove tree.CompareFn 2022-09-08 14:35:43 -07:00
Maximilian Hoffman 6ca0c4fd92 More point lookup optimizations (#4275)
* Avoid building range tuple twice for point lookups

* put uniqueness in GMS

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

* andy's comments

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2022-09-08 12:40:39 -07:00
Zach Musgrave 1c5cab3705 Merge pull request #4284 from dolthub/james/import
add nil check for string pointers during dolt table import
2022-09-07 17:45:33 -07:00
Maximilian Hoffman df81a865b8 rCTEs GMS bump (#4271)
* GMS bump

* tdy

* fix plans
2022-09-07 17:00:02 -07:00
Zach Musgrave 3d47f77c4f Merge pull request #4276 from dolthub/zachmu/auto-clone
Automatically push and pull new databases in replicated servers
2022-09-07 15:43:38 -07:00
Dhruv Sringari 86972d9c1d Adds dolt_merge_status system table (#4277)
* Add dolt merge status table

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

Co-authored-by: druvv <druvv@users.noreply.github.com>
2022-09-07 15:12:43 -07:00
James Cor 19bd1a4b5f Merge pull request #4285 from dolthub/james/bom
trim byte order mark present in UTF-8 encoded files
2022-09-07 14:23:38 -07:00
James Cor ddd7bad231 Merge pull request #4283 from dolthub/james/enum
fix enum panics in history table
2022-09-07 14:22:12 -07:00
James Cor 61ea5650c0 fix 2022-09-07 13:06:14 -07:00
zachmu b5cd791385 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-07 19:49:49 +00:00
Zach Musgrave 8ee4ea6f8a More PR feedback and cleanup, bug fixes 2022-09-07 12:48:27 -07:00
Zach Musgrave 16d7025e5c PR feedback 2022-09-07 12:28:01 -07:00
James Cor 8b68d28391 fix with test 2022-09-07 12:22:53 -07:00
James Cor a6f637a4ad remove comments 2022-09-07 12:08:33 -07:00
James Cor 76679fbbed better solution 2022-09-07 12:04:51 -07:00
James Cor 240ab005ef add nil check for string pointers 2022-09-07 12:03:08 -07:00
James Cor e017187666 add a test 2022-09-07 11:22:29 -07:00
James Cor d1c3d12d89 fix, but need tests 2022-09-07 11:11:13 -07:00
James Cor e38297933d formatting 2022-09-07 10:22:39 -07:00
James Cor a5e17d3548 unskipping tests 2022-09-07 10:21:30 -07:00
James Cor 7bf3d97747 merge with main again 2022-09-07 10:04:26 -07:00
jennifersp 67ddf5e5a6 use commitItr instead of commitwalk for querying dolt_diff table (#4243) 2022-09-07 10:02:01 -07:00
Zach Musgrave 132ce6421e Fixed error test 2022-09-07 08:58:35 -07:00
zachmu f763aa9c50 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-07 03:20:14 +00:00
Zach Musgrave ee6580f76e Bug fix for pushing: need to SetHead on the remote DB 2022-09-06 20:12:11 -07:00
Zach Musgrave 9bfc968e04 Fixed bug pushing to gs remotes in replication, and added better error logging 2022-09-06 19:43:50 -07:00
Zach Musgrave 845b59e443 Typos and cleanup 2022-09-06 16:55:44 -07:00
zachmu e3438c4233 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-06 23:32:24 +00:00
Zach Musgrave ec5f1a6123 Better behavior for database not found on a replica 2022-09-06 16:24:41 -07:00
JCOR11599 32057d7aa2 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-06 23:17:40 +00:00
James Cor 9205824069 fixing test 2022-09-06 16:16:01 -07:00
James Cor d23469f969 changes 2022-09-06 16:13:33 -07:00
Zach Musgrave eac2546df0 Enable prepare step for AWS and GS remotes 2022-09-06 15:20:17 -07:00
Zach Musgrave abd53a58b0 Push the initial db commit to the remote 2022-09-06 15:10:50 -07:00
Zach Musgrave 806e51060c Couple small bug fixes and first bats test 2022-09-06 14:30:53 -07:00
James Cor d6720c168b remove extra skip 2022-09-06 12:31:45 -07:00
James Cor a20cbe4ea2 formatting 2022-09-06 00:36:46 -07:00
James Cor d980dffb19 fix prepared 2022-09-06 00:35:33 -07:00
James Cor ffc22a3b41 missed a filtered table 2022-09-06 00:33:57 -07:00
James Cor d1f2f37b06 removing filtered table 2022-09-06 00:23:26 -07:00
Zach Musgrave 3d38dd81bb another TODO 2022-09-05 21:00:23 -07:00
Zach Musgrave 0e873e0133 Bug fix for clone on use 2022-09-05 17:50:53 -07:00
James Cor 31f38bd7c1 Merge branch 'main' into james/prepareds4 2022-09-05 14:12:14 -07:00
Zach Musgrave 0b98127e41 Calling clone in the right place during db resolution 2022-09-03 16:31:45 -07:00
Zach Musgrave ebdd9506ca First pass at on demand cloning 2022-09-03 16:14:55 -07:00
Zach Musgrave 86a4265a4e Another note 2022-09-02 21:59:52 -07:00
Zach Musgrave 6646935867 Successfully creating remote on new db 2022-09-02 21:33:06 -07:00