mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-14 18:18:55 -06:00
Code Issues Packages Projects Releases 132 Wiki Activity
12,515 Commits 114 Branches 602 Tags
0d25806b38bec491ddfcb09f568dd91640323d51
Commit Graph

12515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Son
0d25806b38 go/{store/datas,libraries/doltcore/doltdb/durable}: Move __DOLT_1__ format to flatbuffers top-of-DAG. 2022-05-05 12:48:58 -07:00
James Cor
6a5f5c6282 Merge pull request #3342 from dolthub/james/geometry 
Adding check for GeometryKind when writing to column
 2022-05-05 09:51:52 -07:00
James Cor
f89561757a I'm surprised this ever worked 2022-05-05 01:19:00 -07:00
jennifersp
1159e90393 Merge pull request #3350 from dolthub/jennifersp-9517b259 
[auto-bump] [no-release-notes] dependency by jennifersp
 2022-05-04 22:00:48 -07:00
jennifersp
4de855a530 Merge branch 'main' into jennifersp-9517b259 2022-05-04 17:09:01 -07:00
Zach Musgrave
c6edf47f20 Merge pull request #3329 from dolthub/zachmu/session-conflicts 
Changed default behavior for handling merge conflicts in sessions
 2022-05-04 17:01:03 -07:00
Zach Musgrave
57f7f30bb8 PR feedback 2022-05-04 16:55:16 -07:00
James Cor
71798db127 fixing more tests 2022-05-04 16:51:25 -07:00
Zach Musgrave
9a08c64092 Added TODO about collaborating on merge conflict resolution 2022-05-04 16:47:29 -07:00
James Cor
9ea7060850 adding cases for geometry 2022-05-04 16:15:04 -07:00
jennifersp
259fac5dcd [ga-bump-dep] Bump dependency in Dolt by jennifersp 2022-05-04 22:42:37 +00:00
James Cor
185d97ac28 refactoring to make helper method 2022-05-04 14:52:43 -07:00
AndyA
8dda9d8d49 Merge pull request #3331 from dolthub/andy/generic-prolly-node 
[no-release-note] Add pkg `message` to abstract flatbuffers details
 2022-05-04 11:43:11 -07:00
AndyA
e4b18d722b Update go/store/prolly/message/serialize_test.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2022-05-04 10:56:35 -07:00
James Cor
3d94d7e262 small typo 2022-05-04 10:11:49 -07:00
Zach Musgrave
bffbdcfbd1 Merge branch 'zachmu/session-conflicts' of github.com:dolthub/dolt into zachmu/session-conflicts 2022-05-03 17:34:51 -07:00
Zach Musgrave
3f8340bb57 Fixed naming problems 2022-05-03 17:34:34 -07:00
zachmu
cd23da90be [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-04 00:34:09 +00:00
Zach Musgrave
0b69b095c1 Fixed leftover issues 2022-05-03 17:32:56 -07:00
Zach Musgrave
e11a5c0bb4 Fixed bug in DROP PROCEDURE IF NOT EXISTS 2022-05-03 17:16:35 -07:00
Zach Musgrave
bc755cd483 New bats test for mysql import (subset of client tests with no dependency on mysqldump or running mysql server) 2022-05-03 17:16:21 -07:00
Dhruv Sringari
7a130c3c0a Merge pull request #3311 from dolthub/dhruv/WIP-merge 
mergeTableData for New Storage Format
 2022-05-03 17:11:35 -07:00
Aaron Son
4f54384d2b Merge pull request #3338 from dolthub/aaron/types-serialmessage-refs-to-addrs 
[no-release-notes] go/store/types: SerialCommitParentRefs -> SerialCommitParentAddrs.
 2022-05-03 16:50:42 -07:00
zachmu
31c7da467f [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-03 23:50:37 +00:00
Zach Musgrave
1cec0397e9 gms upgrade 2022-05-03 16:49:37 -07:00
James Cor
c3555cecf8 Merge branch 'james/geometry' of https://github.com/dolthub/dolt into james/geometry 2022-05-03 16:43:59 -07:00
James Cor
6b73c4216e adding tests 2022-05-03 16:43:51 -07:00
Zach Musgrave
d388c69f38 Fixed remaining tests, added additional ones for the force variable 2022-05-03 16:32:36 -07:00
Zach Musgrave
38791eba50 Fixed bug in DOLT_COMMIT() transaction management 2022-05-03 15:50:37 -07:00
Zach Musgrave
c0199dbd76 Fully specified test, now revealing bug 2022-05-03 15:31:29 -07:00
Zach Musgrave
898fc4b836 Create the dolt_procedures table in the current root only when necessary, not when getting built-in procedures 2022-05-03 15:16:40 -07:00
Zach Musgrave
ad7f5b9525 Added additional test for CALL DOLT_CHECKOUT which was broken when a transaction was in progress 2022-05-03 15:14:41 -07:00
Zach Musgrave
7804b1587d Merge branch 'main' into zachmu/session-conflicts 2022-05-03 14:23:12 -07:00
Zach Musgrave
311aeee3bd Checkpoint before merging main 2022-05-03 14:19:55 -07:00
JCOR11599
d1c58fa90d [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-03 20:11:12 +00:00
James Cor
8811e0b802 not sure why this was here 2022-05-03 13:09:34 -07:00
James Cor
a54e1f1b80 check for point, linestring, polygon kind to geometry kind 2022-05-03 13:05:29 -07:00
Zach Musgrave
912505c5c7 Rewrote conflict resolution rules yet again 2022-05-03 12:54:42 -07:00
James Cor
c9963981e2 Merge branch 'main' into james/geometry 2022-05-03 12:50:12 -07:00
James Cor
cd17175f6d Merge pull request #3341 from dolthub/JCOR11599-ca6cfd14 
[auto-bump] [no-release-notes] dependency by JCOR11599
 2022-05-03 12:26:07 -07:00
JCOR11599
95b3ddf0c9 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2022-05-03 18:47:39 +00:00
Aaron Son
ee8f41aa65 go/store/types: SerialCommitParentRefs -> SerialCommitParentAddrs. 2022-05-03 10:26:27 -07:00
Andy Arthur
7862c9fcaf fix content address tests 2022-05-03 10:26:25 -07:00
Andy Arthur
f49fdf78ee comment doc, cleanup 2022-05-03 10:05:01 -07:00
Andy Arthur
0087c58d8c added address map serialization 2022-05-03 09:39:29 -07:00
Dhruv Sringari
47865fe067 move test fns 2022-05-03 09:22:52 -07:00
Andy Arthur
68c796ff49 Merge remote-tracking branch 'origin/main' into andy/generic-prolly-node 2022-05-02 16:01:25 -07:00
Andy Arthur
8a35593c89 added unit tests for hard-coded access to key/value offsets flatbuffers field 2022-05-02 15:49:03 -07:00
Andy Arthur
1fca9f0fee moved serialization into pkg message 2022-05-02 15:37:51 -07:00
AndyA
982ec4772f Merge pull request #3325 from dolthub/andy/multi-prolly-tree 
[no-release-notes] Prolly tree implementations for `AddressMap` and `ConflictMap`
 2022-05-02 14:29:41 -07:00