Commit Graph

8573 Commits

Author SHA1 Message Date
Zach Musgrave b58942f939 Merge pull request #1410 from alrs/doltcore-alterschema-errs
libraries/doltcore/schema/alterschema: fix dropped errors
2021-03-09 10:34:58 -08:00
Zach Musgrave 6dbf8a8c30 Merge pull request #1409 from alrs/doltcore-rebase-errs
libraries/doltcore/rebase: fix dropped errors
2021-03-09 10:34:13 -08:00
Zach Musgrave 8c1cc1bd68 Merge pull request #1407 from alrs/doltcore-merge-errs
libraries/doltcore/merge: fix dropped errors
2021-03-09 10:31:22 -08:00
Vinai Rachakonda 99140daeff bump gms and jsonagg (#1408)
Bump go-mysql-server to expose jsonagg.
2021-03-09 09:03:14 -05:00
Lars Lehtonen d61d4f13c1 libraries/doltcore/schema/alterschema: fix dropped errors 2021-03-08 17:02:09 -08:00
Lars Lehtonen d18629fb09 libraries/doltcore/rebase: fix dropped errors 2021-03-08 16:57:08 -08:00
Lars Lehtonen e3b2c58b4a libraries/doltcore/merge: fix dropped errors 2021-03-08 16:51:58 -08:00
AndyA 4a56d95208 Merge pull request #1405 from dolthub/andy/turn-off-discord
Turn off discord notify for now
2021-03-08 15:46:52 -08:00
Andy Arthur 96f48f99ed delete noop test 2021-03-08 15:13:00 -08:00
Oscar Batori b241ba582f remove Discord notify 2021-03-08 14:52:41 -08:00
Andy Arthur 403ff8f1f3 noop test 2021-03-08 14:48:20 -08:00
Andy Arthur 2543b4beb9 noop .go change 2021-03-08 14:46:37 -08:00
Andy Arthur 30f9ca224e turn off discord notify for now 2021-03-08 14:41:00 -08:00
Zach Musgrave 649f1fbdd7 Merge pull request #1387 from manojcchoudhary/master
Refactoring error message in merge.go [ https://github.com/dolthub/dolt/issues/1307#issue-804175419 ]
2021-03-08 14:36:42 -08:00
Zach Musgrave 807bba6937 Fixed broken doc links 2021-03-06 19:56:20 -08:00
manojcchoudhary 1bc506292a Merge pull request #1 from manojcchoudhary/manojcchoudhary-patch-1
Refactoring error message in merge.go
2021-03-06 21:17:16 +05:30
manojcchoudhary 4f5befbb74 Update merge.go 2021-03-06 21:12:27 +05:30
Daylon Wilkins ff3b6b0659 Added file names to bats tests 2021-03-05 13:51:52 -08:00
Daylon Wilkins 386d9ef5fd Bump vitess & engine & add Stored Procedure interfaces 2021-03-04 20:31:19 -08:00
Dustin Brown 5cd63fd50e Merge pull request #1385 from dolthub/db/update-queries-correctness
[no-release-notes] /.github/scripts/sql-correctness/get-dolt-correctness-job-json.sh: update queries to include result counts and total test count
2021-03-04 13:18:38 -08:00
Dustin Brown bbda57ef1e /.github/scripts/sql-correctness/get-dolt-correctness-job-json.sh: update queries to include result counts and total test count 2021-03-04 13:16:54 -08:00
Daylon Wilkins 845155e4bb Fixed NULLs causing diff changes using MODIFY COLUMN 2021-03-03 16:26:18 -08:00
Zach Musgrave 4c1c9e2894 Merge pull request #1382 from dolthub/zachmu/yaml-strict
Turned on strict parsing for the sql server config YAML. This catches…
2021-03-03 12:02:36 -08:00
Zach Musgrave a14f570638 Merge pull request #1381 from dolthub/zachmu/typo
Fixed typo in conflicts doc
2021-03-03 12:02:17 -08:00
Zach Musgrave a7368f425a Formatting 2021-03-02 20:17:04 -08:00
Zach Musgrave dace1dda11 Turned on strict parsing for the sql server config YAML. This catches common indentation errors that have confused multiple users. 2021-03-02 20:15:07 -08:00
Zach Musgrave 72adcd3879 Fixed typo in conflicts doc 2021-03-02 19:37:53 -08:00
Aaron Son 3541cba46d Merge pull request #1380 from dolthub/aaron/bump-go-mysql-server
go/go.mod: Bump go-mysql-server.
2021-03-02 15:56:23 -08:00
Aaron Son 0215ceee26 go/go.mod: Bump go-mysql-server. 2021-03-02 14:22:51 -08:00
Zach Musgrave d718aa0364 Merge pull request #1377 from dolthub/zachmu/unskip-tests
Upgraded go-mysql-server and unskipped many tests that now pass
2021-03-01 12:05:15 -08:00
Zach Musgrave 1cfcfd15ae Upgraded go-mysql-server and unskipped many tests that now pass 2021-03-01 11:06:50 -08:00
AndyA 188952e4ad Merge pull request #1375 from dolthub/andy/super-schema-missing
Fix Schema Unmarshalling Error
2021-03-01 09:59:04 -08:00
Andy Arthur 8a9de532ea pr feedback 2021-03-01 09:10:20 -08:00
Brian Hendriks 0a67896ae5 fix overflow issue (#1376) 2021-03-01 09:02:19 -08:00
Brian Hendriks a5dc80cd07 pr feedback 2021-03-01 09:00:10 -08:00
Brian Hendriks 55cfcc524f formatting 2021-03-01 07:52:16 -08:00
Brian Hendriks 3723fe468d new sequence type that doesn't concatenate all the sequences into a single buffer 2021-03-01 07:44:03 -08:00
Brian Hendriks c15f164423 panic on overflow fix 2021-02-28 13:42:51 -08:00
Andy Arthur ee5c14b163 more s/IterAll/Iter/ 2021-02-28 12:54:55 -08:00
Andy Arthur c988f62b26 refactor root update in merge.go 2021-02-28 11:55:31 -08:00
Andy Arthur fc3ee80ef4 refactored List.Iter(), replace IterAll with Iter in marshal decoding (schema marshalling) 2021-02-28 11:54:37 -08:00
Andy Arthur ebeb0d6490 propagate super schema errors 2021-02-27 16:54:57 -08:00
Andy Arthur 9b46cfe34b check error on super schema iter 2021-02-27 16:48:08 -08:00
Oscar Batori 6bf72eda6a Merge pull request #1372 from dolthub/oscarbatori/docs-link-fixes
fix docs links in readme
2021-02-26 14:51:40 -05:00
Oscar Batori 8b9f8c7abb fix docs links in readme 2021-02-26 11:50:26 -08:00
AndyA 4518a60474 Merge pull request #1371 from dolthub/andy/daemonkeeper-bug
improve conflict resolution error messages
2021-02-26 10:39:55 -08:00
Andy Arthur 0374c57634 repofmt 2021-02-26 10:01:58 -08:00
Andy Arthur 2fb2e731f9 improve conflict resolution errors 2021-02-26 09:55:12 -08:00
Brian Hendriks 27318fb827 disable foreign key checks on merge with warning (#1369) 2021-02-25 17:04:59 -08:00
Taylor Bantle 20118a3c89 Merge pull request #1370 from dolthub/taylor/list-workspaces
[no-release-notes]  Add GetWorkspaces method to doltdb
2021-02-25 15:22:14 -08:00