Commit Graph

7719 Commits

Author SHA1 Message Date
Brian Hendriks
348af61251 dolt merge --no-ff (#965) 2020-11-05 14:04:48 -08:00
AndyA
8482e62ca7 Merge pull request #990 from dolthub/andy/mysql-auto_increment
mysql auto increment semantics
2020-11-05 13:15:57 -08:00
Andy Arthur
c177266252 Godeps/update.sh 2020-11-05 12:51:02 -08:00
Andy Arthur
1dd105595e pr feedback 2020-11-05 12:44:02 -08:00
Andy Arthur
fb0016f8ca fixed bats, merging auto_increment values 2020-11-05 12:41:55 -08:00
Andy Arthur
8edc132f52 mysql auto increment semantics 2020-11-05 12:41:55 -08:00
Zach Musgrave
49a18d9503 Merge pull request #994 from dolthub/zachmu/sqllogictest-rename
Updated namespace for sqllogictest
2020-11-05 12:34:53 -08:00
Daylon Wilkins
6d5b1a8072 Added WSL notice to README 2020-11-04 18:13:04 -08:00
Zach Musgrave
9e77c3c7af Updated namespace for sqllogictest
Signed-off-by: Zach Musgrave <zach@dolthub.com>
2020-11-04 18:05:32 -08:00
Andy Arthur
a0e06466aa Revert "added AUTO_INCREMENT merge BATS"
This reverts commit f5f90b6eed.
2020-11-04 17:16:54 -08:00
Andy Arthur
f5f90b6eed added AUTO_INCREMENT merge BATS 2020-11-04 17:08:05 -08:00
Taylor Bantle
7afa2a541e Merge pull request #989 from dolthub/taylor/typos
Fix a few docs typos
2020-11-04 12:00:31 -08:00
Aaron Son
9eb7151be6 Merge pull request #981 from dolthub/aaron/diff-summary-error-handling
Attempt to clean up error signaling in diff summary.
2020-11-04 11:34:38 -08:00
Aaron Son
b65491503a go/store/datas: Attempt to fix (*testing.T).Log race. 2020-11-04 10:57:33 -08:00
Aaron Son
128329a64f go/store/diff: Better naming for GoCatchPanic helper. 2020-11-04 10:37:53 -08:00
Taylor Bantle
8582fa2985 Fix a few more docs typos 2020-11-04 08:42:56 -08:00
Taylor Bantle
bd05c4e201 Remove extra curly braces from checkout docs 2020-11-04 08:25:45 -08:00
Taylor Bantle
d0a3484a42 Merge pull request #988 from dolthub/taylor/infer-schema
{bats, go}: Some fixes to InferSchema and add bats test
2020-11-03 15:42:22 -08:00
Taylor Bantle
c4aeb9bd3e {bats, go}: Some fixes to InferSchema and add bats test 2020-11-03 14:38:46 -08:00
Zach Musgrave
66b27c7a7b Merge pull request #980 from dolthub/zachmu/shell-bugs
Bug fixes for SQL shell: 
* Properly close connection in the case of errors in UPDATE or INSERT statements
* Save query history before execution, not after
2020-11-03 14:05:35 -08:00
Taylor Bantle
da8682e71c Merge pull request #975 from dolthub/taylor/import-helpers
Extract some import logic to be used in dolthubapi
2020-11-03 12:19:09 -08:00
Zach Musgrave
7cbf2d156d Merge branch 'master' into zachmu/shell-bugs 2020-11-02 16:09:10 -08:00
Taylor Bantle
b413ff0732 bats: Update bats test for table import with non existant pk arg 2020-11-02 14:57:47 -08:00
Taylor Bantle
b658c987b7 Run formatter 2020-11-02 14:39:51 -08:00
Taylor Bantle
3fe5cb575e Some cleanup 2020-11-02 14:39:51 -08:00
Taylor Bantle
5c6c50f8f3 Convert panic to errors for SchemaFromCols 2020-11-02 14:39:51 -08:00
Taylor Bantle
643c8efc06 Bats passing 2020-11-02 14:39:51 -08:00
Taylor Bantle
58e4c8362e Extract inferSchema so it can be used by dolthubapi 2020-11-02 14:39:51 -08:00
Taylor Bantle
976e34e8ee Factor out parts of MoveData so that it can be used by dolthubapi 2020-11-02 14:39:51 -08:00
Aaron Son
8f2414ee1e go/libraries/util/async/errgroup{,_test}.go: Update copyright headers for Dolthub. 2020-11-02 11:09:44 -08:00
Aaron Son
eb96988abb Merge remote-tracking branch 'origin/master' into aaron/diff-summary-error-handling 2020-11-02 11:07:55 -08:00
Aaron Son
f6d7fdc75b Merge pull request #985 from dolthub/aaron/update-copyright-headers-dolthub
go/**/*.go: Update copyright headers for company name change.
2020-11-02 11:06:34 -08:00
Aaron Son
84c3066348 go/**/*.go: Update copyright headers for company name change. 2020-11-02 10:17:02 -08:00
Aaron Son
87f5333fa6 go/libraries/utils/async: Fix copyright headers in errgroup{,_test}.go 2020-11-02 10:03:14 -08:00
Aaron Son
1457013ee3 go/libraries/doltcore/merge: Fix potential for deadlock on sending values to conflict channel. 2020-11-02 09:59:39 -08:00
Aaron Son
3fef3fdaaf Merge remote-tracking branch 'origin/master' into aaron/diff-summary-error-handling 2020-11-02 08:40:20 -08:00
Aaron Son
91262016ba Merge pull request #982 from dolthub/aaron/action-executor-uses-sync-waitgroup
go/libraries/utils/async: Have ActionExecutor use sync.WaitGroup.
2020-11-02 08:39:50 -08:00
Aaron Son
c8750708b7 go/libraries/utils/async: Have ActionExecutor use sync.WaitGroup. 2020-11-01 06:47:04 -08:00
Aaron Son
4fcae36a50 go/libraries/utils/async: Add small utility, GoWithCancel. 2020-10-31 08:29:15 -07:00
Aaron Son
3030925c3d go: Convert some diff functions to use errgroup instead of atomicerr.
Attmept to clean up error signaling in diff summary.
2020-10-31 08:27:57 -07:00
Zach Musgrave
1b92ef4f16 Removed redundant close from printOkResult
Signed-off-by: Zach Musgrave <zach@dolthub.com>
2020-10-30 18:00:58 -07:00
Zach Musgrave
770de8a49b In prettyPrint, defer closing the iterator before doing anything else. We were missing close() when an UPDATE or INSERT etc. had an error during cursor iteration, therefore leaving a server process running. Also save sql history file before executing the query, so it gets saved even if the user interrupts execution.
Signed-off-by: Zach Musgrave <zach@dolthub.com>
2020-10-30 17:53:43 -07:00
Dustin Brown
fd99e57add /.github/workflows/ci-go-tests.yaml: run go tests only when go/ changes 2020-10-30 16:45:19 -07:00
Daylon Wilkins
3534d8bd90 Added GitHub workflow tests for race conditions 2020-10-30 16:45:19 -07:00
AndyA
f5d6798695 Merge pull request #973 from dolthub/andy/field-list-support
Support for COM_LIST_FIELDS, fixed SHOW INDEXES
2020-10-30 15:26:26 -07:00
Andy Arthur
608b3a1b70 mysql-client-tests: s/value/value/g 2020-10-30 15:07:06 -07:00
Andy Arthur
1bef37e49a go mod tidy 2020-10-30 14:29:08 -07:00
Andy Arthur
d2a71139ba picking up GMS master 2020-10-30 14:22:58 -07:00
Andy Arthur
a21ec775f3 fixed merge conflict in GMS 2020-10-30 14:21:38 -07:00
Andy Arthur
45455d26bf picking up COM_FIELD_LIST support from vitess 2020-10-30 14:21:26 -07:00