mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-20 19:31:56 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity
14,705 Commits 278 Branches 626 Tags
4e7f392dbdb3980750ba8a5d49df29324d201316
Commit Graph

249 Commits

Author SHA1 Message Date
Zach Musgrave 4e7f392dbd Bug fixes, new schema diff interface 2022-08-23 10:03:31 -07:00
Dhruv Sringari 4df584336e Fix for diffing across Dolt databases (#4097) 2022-08-16 14:18:35 -07:00
Andy Arthur 7a70fe1856 cleanup remaining references to __DOLT_1__ 2022-08-09 15:34:10 -07:00
Dhruv Sringari cad363deeb Fix indeterministic diff delta matching (#4036) 
* fix indeterministic diff delta matching

Before this fix, tables with different names would attempted to be matched even if there was a pair of tables with a matching name.

* add a test

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

* copyright

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-08-08 17:44:28 -07:00
Dhruv Sringari 2cf9a2134f [no-release-notes] In __DOLT_1__, throw error if schemas have different primary key types (#3852) 
* In __DOLT_1__, throw error if schemas have different primary key types

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

* schema integration test fix

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

* Compare SQL types

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-07-19 16:59:12 -07:00
Andy Arthur 1c5481d6e5 Merge remote-tracking branch 'origin/main' into andy/dolt-docs 2022-07-15 10:01:03 -07:00
Dhruv Sringari d2d0864391 [no-release-notes] keyless diff for the new format (#3817) 
* keyless diff for the new format

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

* pr comment

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-07-13 14:42:43 -07:00
Andy Arthur faaf7da768 Merge remote-tracking branch 'origin/main' into andy/dolt-docs 2022-07-13 11:15:19 -07:00
Andy Arthur 7b6e77e565 rip out docs 2022-07-05 17:25:28 -07:00
Aaron Son 829981ad64 doltdb: Remove some shims from VRW to NodeStore; carry NodeStores around. 2022-07-05 13:28:56 -07:00
zachmu ea9ee3f9bd [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-06-28 00:34:12 +00:00
Zach Musgrave 45bd67cc94 Clean up and refactor 2022-06-27 15:44:59 -07:00
Zach Musgrave f1591568f5 Reverted name change for diff enum so it matches what we return in the diff table results 2022-06-24 12:51:38 -07:00
Zach Musgrave 5f193d2e29 Removed obsolete files, moved diff constants / interfaces into their own file 2022-06-24 12:49:37 -07:00
Zach Musgrave b79bbc9646 SQL diff writer implementation and interface 2022-06-23 15:08:15 -07:00
Zach Musgrave e7ab49a926 Fixed diff summary bug, starting to implement sql diff writer 2022-06-23 11:47:19 -07:00
Zach Musgrave 9212ae916e Bug fix and skipped a --summary test 2022-06-22 17:19:44 -07:00
Zach Musgrave ea07611e90 Diff summary for new format 2022-06-22 16:56:05 -07:00
Zach Musgrave e1e9823102 Moved diffsplitter into its own file 2022-06-22 10:25:46 -07:00
Zach Musgrave 3bff8a7867 Small bug fixes for schema methods with nil schemas 2022-06-21 09:30:03 -07:00
Zach Musgrave 044ff2747e Merge main 2022-06-17 15:53:15 -07:00
Dhruv Sringari f608335ba7 [no-release-notes] foreign key constraint violations for new storage format (#3605) 
* Add Hash160Enc

* persist and read conflicts from merge artifacts table

* update some tests

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

* comment / cleanup prolly/artifact_map.go

* ~copyright~

* reskip TestDoltMerge

* rename Hash160Enc to Address

* change ArtifactType from string to uint8

* fix zero value for ArtifactType

* merge sets of conflicts together, update some tests

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

* pr comments

* cvs can be written to and read

* merge with CVs for new storage format

* working!

* skip cv test

* unskips dolt transaction tests

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

* some cleanup, fix tests

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

* copyright

* fix cv hash roundtripping

* pr comments

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

* cleanup

* fix vet errors and tests

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-06-14 19:45:22 -07:00
Zach Musgrave 2f91870c17 Slowly gutting color diff sink 2022-06-14 11:40:58 -07:00
Zach Musgrave df798b77b4 Change table writer interface to use change type instead of color 2022-06-14 11:29:11 -07:00
Dhruv Sringari 06947de821 [no-release-notes] merge sets of conflicts together (#3586) 
* Add Hash160Enc

* persist and read conflicts from merge artifacts table

* update some tests

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

* comment / cleanup prolly/artifact_map.go

* ~copyright~

* reskip TestDoltMerge

* rename Hash160Enc to Address

* change ArtifactType from string to uint8

* fix zero value for ArtifactType

* merge sets of conflicts together, update some tests

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

* pr comments

* skip cv test

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-06-13 14:37:23 -07:00
Zach Musgrave 58a40792fe Cleaned up row splitter methods 2022-06-10 09:47:04 -07:00
Jason Fulghum d86e097bdf Removing prereq edge cases for TableDelta's HasHashChanged and HasSchemaChanged. 2022-06-08 11:54:18 -07:00
Jason Fulghum c62fe307c9 Adding helper methods to TableDelta 2022-06-07 11:58:37 -07:00
James Cor 9b3178e45f merge with main 2022-06-06 09:30:27 -07:00
Dhruv Sringari bb1eab6e7f [no-release-notes] progress on Diff and Merge (#3523) 
* resolving conflicts from SQL for new format

also some diff work
fix new format diff bug

I flipped n and m

* reskip test

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

* pr feedback

* unskip TestDiffTableFunction, fix TestTransactions

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-06-03 11:03:23 -07:00
James Cor e5c1aa002a working even when adding from columns 2022-06-01 11:24:40 -07:00
James Cor a6c2c23933 fixing async tests 2022-06-01 10:15:17 -07:00
James Cor 96baacda14 cleaning up: 2022-06-01 10:11:22 -07:00
James Cor e4238b774a indexed look ups mostly working, but lower bound always inclusive? 2022-06-01 10:00:03 -07:00
Aaron Son afab5f544c doltdb: Commit: Store a *datas.Commit intsead of rootV, CommitMeta, stref, etc. 2022-04-04 13:26:01 -07:00
Jason Fulghum dbbf2d16e0 Renaming column renamer namer functions to be more explicit. 2022-03-18 09:36:07 -07:00
Jason Fulghum 1d08c10191 Pulling out duplicated To/From Namer functions into diff namespace. 2022-03-10 15:54:57 -08:00
Jason Fulghum 7918a7c22a Merge branch 'main' into fulghum/dolt-diff-removing-tag-names 2022-02-21 09:02:17 -08:00
Jason Fulghum 43d22c740f Refactoring RowConvertor.Convert to work with an optional WarnFunction callback function, instead of passing around optional context. 2022-02-18 15:48:10 -08:00
Jason Fulghum 56078dbeae Fixing a bug in sql_diff that caused malformed update statements to be returned. 2022-02-18 14:51:39 -08:00
Jason Fulghum 7b5ea7bbe6 Changed DoltDiffTable to stop disambiguating column names with tag suffixes when they conflict and instead restrict output schema to be based on current table schema. 2022-02-17 17:26:24 -08:00
Jason Fulghum d0ca4b86c0 typo 2022-02-16 13:51:15 -08:00
Aaron Son 52fc803365 Remove ValueReadWriter interface from Database. 2022-02-01 17:20:06 -08:00
Andy Arthur 761510e4d5 threading prolly indexes 2022-01-11 14:54:54 -08:00
Andy Arthur 7a82e0c6e9 renamed doltdb.Table.GetRowData() to GetNomsRowData() 2022-01-06 14:14:48 -08:00
Andy Arthur bd517a6be2 replaced index types.Map with durable.IndexSet 2022-01-05 15:58:02 -08:00
Andy Arthur 499d3488ab refactored conflict schemas 2021-12-13 11:08:06 -08:00
Zach Musgrave db5a2980cb Fixed bug in foreign key display for schema diffs 2021-11-19 20:09:16 -08:00
zachmu 4323f2dc50 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-11-19 20:44:32 +00:00
Zach Musgrave a85d77f081 Fixed bug leading to CHECK constraints not showing up in schema diffs. This involved rewriting the main schema diff to use textual diff of SHOW CREATE TABLE outputs, rather than custom logic 2021-11-19 12:24:41 -08:00