mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-13 19:29:58 -05:00
Code Issues Packages Projects Releases 146 Wiki Activity
15,370 Commits 160 Branches 616 Tags
e0bb97d9c7ca76ee07066336ee6a5ad83a0c32fd
Commit Graph

15370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cor
e0bb97d9c7 Merge pull request #4318 from dolthub/james/conflicts 
implement `call dolt_conflicts_resolve()`
 2022-09-29 09:59:40 -07:00
Tim Sehn
b906777e12 Merge pull request #4426 from dolthub/tim/update-readme 
Reference new socket interface functionality in README
 2022-09-29 09:16:43 -07:00
Tim Sehn
18aa514c46 Update README.md 
Co-authored-by: Jason Fulghum <jason@dolthub.com>
 2022-09-29 09:16:26 -07:00
Tim Sehn
19cdb64b72 Reference new socket interface functionality in README 2022-09-29 09:08:34 -07:00
Hydrocharged
41fc88476f [ga-bump-release] Update Dolt version to 0.41.7 and release v0.41.7 v0.41.7 2022-09-29 12:57:41 +00:00
Daylon Wilkins
aff9bb190b Merge pull request #4425 from dolthub/Hydrocharged-323a8479 
[auto-bump] [no-release-notes] dependency by Hydrocharged
 2022-09-29 03:56:32 -07:00
Hydrocharged
3ae29f6e4b [ga-bump-dep] Bump dependency in Dolt by Hydrocharged 2022-09-29 06:24:32 +00:00
James Cor
9cc1d99b1a bad test 2022-09-28 15:54:07 -07:00
JCOR11599
f21b1c9c2c [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-28 22:35:59 +00:00
James Cor
cbab3946c1 removing use of dEnv 2022-09-28 15:34:17 -07:00
James Cor
01332bb8c7 only making procedure version 2022-09-28 15:25:39 -07:00
James Cor
786e892f1c fix tests again 2022-09-28 14:11:45 -07:00
jennifersp
f99a1717c2 improve error message when current branch on session is force deleted (#4395) 2022-09-28 14:04:24 -07:00
James Cor
149720fcaa test fix 2022-09-28 13:50:34 -07:00
James Cor
16a2ae75c2 row data 2022-09-28 13:40:00 -07:00
James Cor
c555f0b16c one last test, probably 2022-09-28 13:23:41 -07:00
JCOR11599
b3af84be09 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-28 20:13:44 +00:00
James Cor
dc18ebb1f5 adding foreign key checks 2022-09-28 13:12:09 -07:00
James Cor
fea7fa876c more refactoring 2022-09-28 11:39:14 -07:00
James Cor
da8246b942 copy pasta and refacta 2022-09-28 11:35:09 -07:00
James Cor
d0546ffcdf feedbacK 2022-09-28 11:23:28 -07:00
jennifersp
4565f37da2 turn off opt-in feature for unix socket (#4413) 2022-09-28 10:28:01 -07:00
James Cor
b683820fc6 it now do the thing 2022-09-27 23:31:13 -07:00
andrew-wm-arthur
b968a5260a [ga-bump-release] Update Dolt version to 0.41.6 and release v0.41.6 v0.41.6 2022-09-28 00:23:09 +00:00
James Cor
413ca59ec6 some changes, need to fix prolly conflicts to not remerge 2022-09-27 17:15:39 -07:00
AndyA
5cf939c7c4 Merge pull request #4418 from dolthub/max-hoffman-8b178aa5 
[auto-bump] [no-release-notes] dependency by max-hoffman
 2022-09-27 17:14:01 -07:00
max-hoffman
89ac8b1d7d [ga-bump-dep] Bump dependency in Dolt by max-hoffman 2022-09-27 22:25:13 +00:00
JCOR11599
9760bd26e1 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-27 22:20:47 +00:00
James Cor
8ff785a3e3 i wonder what this will break 2022-09-27 15:19:19 -07:00
jennifersp
a1e57989bb allow drop current database directory and fix drop db with '-' (#4400) 2022-09-27 11:45:07 -07:00
James Cor
6d51206676 more tests, and small keyless fix 2022-09-27 11:29:20 -07:00
James Cor
d000d35f39 i wrote test bad 2022-09-27 10:04:20 -07:00
James Cor
400999e064 Merge branch 'james/conflicts' of https://github.com/dolthub/dolt into james/conflicts 2022-09-27 00:59:36 -07:00
James Cor
bf1de09adf rename to prolly 2022-09-27 00:59:28 -07:00
JCOR11599
3d2ea83dc9 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-27 07:23:52 +00:00
James Cor
26d0bc6dd1 working for noms, new format tomorrow :)))))) 2022-09-27 00:21:58 -07:00
James Cor
a0f1d6fe32 i forget 2022-09-26 21:06:53 -07:00
jennifersp
f4be51d692 reorder arguments of dolt_diff() table function (#4408) 2022-09-26 16:33:45 -07:00
JCOR11599
84526cdf65 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-26 23:06:20 +00:00
James Cor
f1204c3814 keyless conflicts figured out probably, but i have denv anyway 2022-09-26 16:03:04 -07:00
AndyA
7ba66fdc76 Merge pull request #4401 from dolthub/andy/mysql-validator 
go/commands: Add sql-server option for validating query results against a MySQL instance
 2022-09-26 14:24:43 -07:00
andrew-wm-arthur
fdb4c85241 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-26 20:31:19 +00:00
Andy Arthur
f7aab78e4e Merge remote-tracking branch 'origin/main' into andy/mysql-validator 2022-09-26 13:22:19 -07:00
Jason Fulghum
7c413b965c Merge pull request #4268 from xujihui1985/feat/support-aliyun-oss-store 
New feature: support Aliyun OSS store
 2022-09-26 13:06:18 -07:00
andrew-wm-arthur
c20bae1d9d [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-26 18:54:20 +00:00
Andy Arthur
ec3cdfa783 pickup GMS changes 2022-09-26 11:52:49 -07:00
James Cor
9a33753130 test format 2022-09-26 10:29:45 -07:00
James Cor
76d9eec826 Merge branch 'main' into james/conflicts 2022-09-26 10:03:11 -07:00
jennifersp
691997b87a support dolt_diff_summary_table_function (#4363) 2022-09-26 09:48:58 -07:00
AngrySean
a121de3724 Merge branch 'main' into feat/support-aliyun-oss-store 2022-09-25 09:05:56 +08:00