mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-06 10:32:23 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity
19,934 Commits 94 Branches 597 Tags
6538cbd2edeb2363e205bcddcef47eeefba2521d
Commit Graph

12829 Commits

Author SHA1 Message Date
Neil Macneale IV
0a74312178 Create the local connection user on server startup 
Make use of it when the user specifies not user and pwd
 2023-06-16 15:56:11 -07:00
Neil Macneale IV
cc94161010 Add ability to skip the error when only a password is provided. 
This is intended to enable testing only.
 2023-06-16 15:56:11 -07:00
Neil Macneale IV
0628c7fd52 Use mysql_native_password auth response to authenticate local user 2023-06-16 15:56:11 -07:00
Neil Macneale IV
0d27a97bf7 Hide typing when prompted for password 2023-06-16 15:56:11 -07:00
Neil Macneale IV
9f02d16243 Allow use of DOLT_CLI_PASSWORD 2023-06-16 15:56:11 -07:00
Neil Macneale IV
ad66ec2043 Prompt for user credentials object when building client connection config 2023-06-16 15:56:11 -07:00
Neil Macneale IV
cd0cf8f9a4 Add ability to drop values from ArgParserResults 2023-06-16 15:56:11 -07:00
Neil Macneale IV
f122c86949 Add password flag to global arguments 2023-06-16 15:56:11 -07:00
Neil Macneale IV
e52cfc5847 Put cli flags in their own file. 2023-06-16 15:56:11 -07:00
Zach Musgrave
745221b8f6 Merge pull request #6114 from dolthub/zachmu/docs 
Better docs for sql-server command
 2023-06-16 13:44:22 -07:00
James Cor
44abf89d55 improve valid identifer logic (#6158) 2023-06-16 09:20:43 -07:00
James Cor
4d2dbb9746 add hash column to result set for dolt_merge(..., '--no-ff') (#6163) 2023-06-16 01:39:03 -07:00
fulghum
48e336af23 [ga-bump-release] Update Dolt version to 1.4.2 and release v1.4.2 2023-06-16 00:00:33 +00:00
Jason Fulghum
498ca58a7a Merge pull request #6164 from dolthub/fulghum/cherry-pick 
Bug fix: Enable `dolt_cherry_pick` stored procedure to work with `@@autocommit`
 2023-06-15 16:52:16 -07:00
Jason Fulghum
c14e23ab27 Changing dolt_cherry_pick to enable it to work when @@autocommit=1 2023-06-15 14:51:09 -07:00
Maximilian Hoffman
d3e8f0eab8 [no-release-notes] gms bump (#6148) 
* [no-release-notes] gms bump

* bump

* no stock explain test

* not branch plans

* rewrite branch plans

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

* bump

* bump

* skip cherry-pick flake

---------

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
 2023-06-14 17:15:07 -07:00
James Cor
ea590f0c0b Merge pull request #6147 from dolthub/JCOR11599-52747221 
[auto-bump] [no-release-notes] dependency by JCOR11599
 2023-06-14 13:29:55 -07:00
fulghum
1cc15c4332 [ga-bump-release] Update Dolt version to 1.4.1 and release v1.4.1 2023-06-14 18:03:17 +00:00
Jason Fulghum
0e072e0ab8 Merge pull request #6144 from dolthub/fulghum/cherry-pick 
Feature: Support for cherry-picking commits that require conflict resolution
 2023-06-14 10:53:49 -07:00
Jason Fulghum
47bbf2fff6 Ensure that removed tables are staged in the index first 2023-06-14 09:34:55 -07:00
Zach Musgrave
05168e982b Merge pull request #6149 from dolthub/zachmu/ld-fix 
[no-release-notes] Bug fix for dolt_diff in detached head state
 2023-06-13 16:16:33 -07:00
Zach Musgrave
bf62c7cd6a Merge pull request #6143 from dolthub/zachmu/disable-batch 
Ripped out batch processing in SQL engine / session
 2023-06-13 15:59:50 -07:00
Zach Musgrave
ddb1cc2f22 Bug fix for dolt_diff in detached head state 2023-06-13 15:37:28 -07:00
JCOR11599
6595064710 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2023-06-13 21:24:42 +00:00
zachmu
45b0f1213e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-13 21:24:26 +00:00
Jason Fulghum
1103cdbc0d Fixing merge tests 2023-06-13 14:12:24 -07:00
Jason Fulghum
c287d6bc9d Merge branch 'main' into fulghum/cherry-pick 2023-06-13 14:09:28 -07:00
Zach Musgrave
716aeba17b Fixed a bug where line message wasn't being displayed, fixed some tests 2023-06-13 14:09:18 -07:00
Jason Fulghum
fcc0db9467 Tidying up 2023-06-13 13:26:10 -07:00
Jason Fulghum
e78ce08e8b Fixing dolt_merge tests 2023-06-13 13:19:05 -07:00
Jason Fulghum
f28c2be53d Merge branch 'fulghum/cherry-pick' of https://github.com/dolthub/dolt into fulghum/cherry-pick 2023-06-13 13:00:16 -07:00
Jason Fulghum
12501bf919 Reverting change to dolt_cherry_pick stored procedure's return schema 2023-06-13 13:00:09 -07:00
fulghum
a91152f88b [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-13 19:56:05 +00:00
Jason Fulghum
389279c000 Minor fixes to dolt_merge stored procedure 2023-06-13 12:41:31 -07:00
Jason Fulghum
761a881fa1 Converted sql-cherry-pick BATS tests to enginetests 2023-06-13 12:30:02 -07:00
Tim Sehn
c4da2bc2d2 Merge pull request #6140 from dolthub/max-hoffman-d71df24c 
[auto-bump] [no-release-notes] dependency by max-hoffman
 2023-06-13 12:26:21 -07:00
Zach Musgrave
199ce7ca8e Merge pull request #6145 from dolthub/zachmu/ld-fix 
[no-release-notes] Removed another type switch and replaced with an interface
 2023-06-13 12:14:05 -07:00
zachmu
9a245d5e40 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-13 18:03:28 +00:00
Zach Musgrave
5f33b96486 Removed another type switch and replaced with an interface 2023-06-13 10:46:52 -07:00
Pavel Safronov
405293010a Merge pull request #6106 from dolthub/pavel/batsee-output-dir 2023-06-13 06:20:34 -10:00
Jason Fulghum
4f7f5da00f Start of enginetests 2023-06-12 19:33:31 -07:00
Jason Fulghum
ce34ba3c37 Tidying up 2023-06-12 19:20:54 -07:00
Zach Musgrave
f8da4c06cb Merge main 2023-06-12 16:24:55 -07:00
Jason Fulghum
46dfabfef1 Allowing schema changes for cherry-pick 2023-06-12 16:21:57 -07:00
Zach Musgrave
d2ec6cf54d Deleted batched tests and ripped out batch writer logic 2023-06-12 16:20:54 -07:00
Jason Fulghum
15a9110a1a Adding additional info link to error message 2023-06-12 16:20:21 -07:00
Zach Musgrave
b745a8e1f2 Removed batch mode internals 2023-06-12 16:17:45 -07:00
Jason Fulghum
bc91c20f5e First pass at dolt_cherry_pick stored procedure support for dealing with conflicts 2023-06-12 16:17:31 -07:00
Zach Musgrave
af918aba11 Killed batch processing mode 2023-06-12 16:08:36 -07:00
Zach Musgrave
ee8a7e69f4 Merge pull request #6142 from dolthub/zachmu/ld-fix 
New interface method to return underlying dolt dbs from a SqlDatabase…
 2023-06-12 15:47:33 -07:00