mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-13 01:19:48 -06:00
Code Issues Packages Projects Releases 119 Wiki Activity
19,941 Commits 50 Branches 589 Tags
65719c72466daabe6a004dcafe3e4724d975bdcb
Commit Graph

12835 Commits

Author SHA1 Message Date
Stephanie You
65719c7246 updates dolt commit to properly display skip empty commit message 2023-06-16 16:42:48 -07:00
Stephanie You
a803adbc9a fix schema merge test requiring non-nil cliCtx 2023-06-16 16:42:48 -07:00
stephkyou
6e4726fded [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-16 16:42:48 -07:00
Stephanie You
a8a1891857 fix dolt init go test accessing nil error 2023-06-16 16:42:48 -07:00
Stephanie You
ba7e8b46d7 remove DSess from dolt commit helper functions 2023-06-16 16:42:48 -07:00
Stephanie You
e57a43b0de interpolates sql query in dolt commit to prevent sql injection 2023-06-16 16:42:48 -07:00
Stephanie You
779fb51f81 minor fixes for dolt commit 2023-06-16 16:42:48 -07:00
stephkyou
4dfc5bef0e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-16 16:42:48 -07:00
Stephanie You
fb18572931 update callDoltCommitStoredProc helper function name 2023-06-16 16:42:48 -07:00
Stephanie You
76e3ca4327 update dolt commit to print results without dolt log 2023-06-16 16:42:48 -07:00
Stephanie You
bf62b96262 updates dolt commit to retrieve head commit message with sql query 2023-06-16 16:42:48 -07:00
Stephanie You
c463d689a3 updates dolt commit to use dolt_commit stored procedure 2023-06-16 16:42:48 -07:00
Stephanie You
a8a40e6468 update dolt commit helper functions to remove dEnv 2023-06-16 16:42:48 -07:00
Stephanie You
950d7388c3 update dolt commit to use sql queries 2023-06-16 16:42:48 -07:00
Stephanie You
f553258ef7 adds dolt config to CliContext 2023-06-16 16:42:48 -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