mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-01 10:09:41 -06:00
Code Issues Packages Projects Releases 139 Wiki Activity
22,116 Commits 135 Branches 609 Tags
b47eeb4decca51a145ba992e29ad0759fefcbe9a
Commit Graph

22116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephanie You
b47eeb4dec PR comments 2023-12-01 15:00:05 -08:00
Stephanie You
e9c63acccd another description update 2023-11-30 11:37:12 -08:00
Stephanie You
0f2e9261e3 reflog doc update 2023-11-30 11:28:52 -08:00
Stephanie You
5d24edd9ef address PR comments 2023-11-29 18:43:36 -08:00
Stephanie You
3e5c6b6bb7 minor test updates 2023-11-29 11:34:12 -08:00
Stephanie You
6ba1d09cd8 change error test output 2023-11-29 11:34:12 -08:00
stephkyou
37158e01a6 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-11-29 11:34:11 -08:00
Stephanie You
d3e7c7dfb3 add --all for reflog 2023-11-29 11:34:11 -08:00
Stephanie You
fccec02c72 basic dolt reflog implementation 2023-11-29 11:34:11 -08:00
Stephanie You
adcf3c10f3 tests for dolt reflog 2023-11-29 11:34:11 -08:00
Neil Macneale IV
207d284d87 Merge pull request #7062 from dolthub/macneale4/aws-upgrade 
aws sdk upgrade
 2023-11-29 09:27:36 -08:00
Kamat, Trivikram
a4dfae036c chore: update dependencies 2023-11-29 08:43:14 -08:00
Kamat, Trivikram
beee304ade chore: manual cleanup 2023-11-29 08:43:14 -08:00
Kamat, Trivikram
efd08ab01c Migrate AWS SDK for JavaScript v2 APIs to v3 2023-11-29 08:43:14 -08:00
dependabot[bot]
687aa0ea1a Bump golang.org/x/image from 0.5.0 to 0.10.0 in /go (#6938) 
Bumps [golang.org/x/image](https://github.com/golang/image) from 0.5.0 to 0.10.0.
- [Commits](https://github.com/golang/image/compare/v0.5.0...v0.10.0)

---
updated-dependencies:
- dependency-name: golang.org/x/image
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-29 08:39:19 -08:00
Neil Macneale IV
3c9d6342d3 [no-release-notes] hasher utility (#7059) 2023-11-28 16:42:03 -08:00
Dustin Brown
1a0499f67b [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7058) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2023-11-28 14:58:16 -08:00
jennifersp
d3c4a9a444 remove dolt stored procedure aliases (#7054) 2023-11-28 10:33:23 -08:00
Nick Tobey
37c8b56616 Merge pull request #7042 from dolthub/nicktobey/schemamergetestsfix 
Run nullness checking on merged rows during three-way merges.
 2023-11-27 14:56:20 -08:00
JCOR11599
a35abc2187 [ga-bump-release] Update Dolt version to 1.28.2 and release v1.28.2 v1.28.2 2023-11-27 22:30:44 +00:00
Dustin Brown
a30dededb3 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7053) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2023-11-27 14:06:55 -08:00
Aaron Son
597ad0e81c Merge pull request #7052 from dolthub/aaron/fix-splunk-for-stale-manifest-with-chunk-journal 
[no-release-notes] go/store/cmd/noms: Change root to use config.(*Resolver).GetDatabase.
 2023-11-27 12:56:51 -08:00
Neil Macneale IV
4a1c1e6e4a Remove unused functions from noms_root.go 2023-11-27 12:55:03 -08:00
Neil Macneale IV
2dc6fa7a8b Refresh the root on '/' 2023-11-27 12:54:57 -08:00
Aaron Son
aa24a2f192 [no-release-notes] go/store/cmd/noms: Change root to use config.(*Resolver).GetDatabase. 2023-11-27 11:45:24 -08:00
Dustin Brown
00a919d121 [auto-bump] [no-release-notes] dependency by JCOR11599 (#7047) 2023-11-24 01:56:50 -08:00
Dustin Brown
9ceca1f317 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7041) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2023-11-22 23:50:53 -08:00
nicktobey
2ffd0cdf26 [ga-bump-release] Update Dolt version to 1.28.1 and release v1.28.1 v1.28.1 2023-11-23 03:27:22 +00:00
Nick Tobey
2df1cf352c Merge pull request #7044 from dolthub/nicktobey/idea 
Track whether or not rows actually need to be remapped to the result schema.
 2023-11-22 19:18:29 -08:00
Nick Tobey
e60170d8d9 Track whether or not rows actually need to be remapped to the result schema. This prevents a bunch of expensive computation in places where it isn't necessary. 2023-11-22 17:46:44 -08:00
Nick Tobey
c04ced8f9e Handle nullcheck checks for resolved edited rows in three-way merges. 2023-11-22 13:40:48 -08:00
Nick Tobey
94d037b529 Add tests for schema merging with constraints. 2023-11-22 13:40:44 -08:00
fulghum
f400a12195 [ga-bump-release] Update Dolt version to 1.28.0 and release v1.28.0 v1.28.0 2023-11-22 01:02:35 +00:00
Jason Fulghum
13e29080f9 Merge pull request #7037 from dolthub/fulghum-0a2b9016 
[auto-bump] [no-release-notes] dependency by fulghum
 2023-11-21 17:01:30 -08:00
Jason Fulghum
3f90521272 Fixing BATS test after allowing TEXT/BLOB/JSON fields to accept a literal default value (for MariaDB compatibility) 2023-11-21 15:45:50 -08:00
fulghum
8e8b89dadb [ga-bump-dep] Bump dependency in Dolt by fulghum 2023-11-21 23:16:19 +00:00
Zach Musgrave
f8e2371d24 Merge pull request #7024 from nustiueudinastea/concurrent-branches-map 
Concurrent branches map
 2023-11-21 11:47:39 -08:00
Alex Giurgiu
015efd4c53 reverting older ordering, changed during merge 2023-11-21 13:29:38 +02:00
Alex Giurgiu
cab07b32c1 added the nil check when unmarshaling from json 2023-11-21 13:26:03 +02:00
Alex Giurgiu
fb4275a65e Merge branch 'main' into concurrent-branches-map 2023-11-21 13:25:17 +02:00
Nick Tobey
9bc32d9db2 Merge pull request #6980 from dolthub/nicktobey/schemamerge 
Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge.
 2023-11-20 23:12:26 -08:00
Nick Tobey
6527d9d6e9 Update docstring for mergeProllyTableData 2023-11-20 21:52:22 -08:00
Nick Tobey
8cf2982898 Add comments explaining why we have to handle left-only diffs during three-way merge. 2023-11-20 21:49:41 -08:00
Neil Macneale IV
dbb5ce3d2d Merge pull request #7023 from dolthub/macneale4/fix_dolt_fetch_pull 
fix dolt fetch and dolt pull commands to properly authenticate
 2023-11-20 20:32:04 -08:00
macneale4
aacfd0a673 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-11-21 02:46:35 +00:00
Neil Macneale IV
0780d4e496 Update tests for more descriptive messages 2023-11-20 18:39:42 -08:00
Neil Macneale IV
16a9dd80d4 Refactor to keep sql.Context out of interceptors.go 2023-11-20 18:39:35 -08:00
Nick Tobey
89f89a0997 Don't run check validator on resolved deleted rows: it's not needed and won't work. 2023-11-20 18:01:54 -08:00
Nick Tobey
560dfc02a7 Rename GetKeyColumnsDescriptor to GetKeyDescriptorWithNoConversion 2023-11-20 14:39:28 -08:00
Nick Tobey
c278833866 Refactor test harness to make clear why we're copying the test object. 2023-11-20 14:38:41 -08:00