mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-13 11:09:10 -05:00
Code Issues Packages Projects Releases 146 Wiki Activity
22,124 Commits 158 Branches 616 Tags
bd045ae65809af34887e2d13ecb14f3696513d77
Commit Graph

22124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephanie You
bd045ae658 refactor queryist utils 2023-11-30 15:32:43 -08:00
stephkyou
9486e434bc [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-11-30 23:11:26 +00:00
Stephanie You
86d12d7b8e remove dolt sql-client command 2023-11-30 14:59:59 -08:00
Nick Tobey
804f1c1d8f Merge pull request #7035 from dolthub/nicktobey/schemamerge4 
Detect data conflicts even when one branch has the same binary representation as the ancestor.
 2023-11-29 18:00:21 -08:00
Nick Tobey
ce5f98a655 Update go/libraries/doltcore/diff/diff_stat.go 
Co-authored-by: Jason Fulghum <jason@dolthub.com>
 2023-11-29 16:30:39 -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
Nick Tobey
60ccfec068 Propagate considerAllRowsModified to more relevant places, and add more meaningful comments and todos. 2023-11-28 12:48:08 -08:00
Nick Tobey
09d8c9db47 Propagate considerAllRowsModified to more relevant places, and add more meaningful comments and todos. 2023-11-28 12:21:03 -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
Nick Tobey
abcaea29d2 Post-merge fixup. 2023-11-27 10:22:48 -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
Nick Tobey
ececb88bac Merge branch 'main' into nicktobey/schemamerge4 2023-11-22 22:37:27 -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
nicktobey
30a5908fb1 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-11-22 22:06:03 +00:00
Nick Tobey
bc6df10d3a Refactor rebuildPrimaryIndex, rebuildSecondaryIndexes, and DiffInfo to make it more readable. 2023-11-22 13:59:13 -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
Nick Tobey
48cfabce0e Refactor DiffInfo struct into prolly tree package instead of merge package. 2023-11-22 11:35:24 -08:00
Nick Tobey
4c746771bb Track whether the left and right schemas are equal. If they're not, then the three way differ should never produce a convergent edit. 2023-11-22 02:10:50 -08:00
Nick Tobey
23c09343c6 During three way merge, only process stored columns, not virtual columns. 2023-11-21 17:12:26 -08:00
Nick Tobey
b6232a5b5e Create and propagate MergeInfo struct. 2023-11-21 17:12:14 -08:00
Nick Tobey
887ed8c990 Copmute whether schemas have changed during three way merge. 2023-11-21 17:11:50 -08:00
Nick Tobey
a69ac26d7c Add considerAllRowsModified option to Differ. 
This is useful for three way merges: in the presence of a schema change, we want every key in a diff to be considered modified, even if the tuple value doesn't change.
 2023-11-21 17:11:50 -08:00
Nick Tobey
b3943e5397 Re-enabled skipped tests. 2023-11-21 17:11:50 -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