mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-20 17:20:43 -05:00
Code Issues Packages Projects Releases 149 Wiki Activity
19,941 Commits 176 Branches 619 Tags
65719c72466daabe6a004dcafe3e4724d975bdcb
Commit Graph

19941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Fulghum
cb4a50acc0 Cleaning up BATS tests 2023-06-13 12:45:31 -07:00
Jason Fulghum
389279c000 Minor fixes to dolt_merge stored procedure 2023-06-13 12:41:31 -07:00
Zach Musgrave
ea6c8abe91 Fix more tets 2023-06-13 12:35:10 -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
Jason Fulghum
b7588dfa99 Tidying up 2023-06-13 12:18:13 -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
Zach Musgrave
9beffb1b62 Fixed more tess 2023-06-13 12:13:47 -07:00
Zach Musgrave
dd76332964 Fixed a couple tests 2023-06-13 11:53:36 -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
jennifersp
6f3cb6f1b1 Update ORMDockerfile 2023-06-12 20:51:13 -07: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
Jason Fulghum
627ae1cc6d Fixing table rename test 2023-06-12 16:01:06 -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
Jason Fulghum
f7e02f28a5 BATS tests for cherry-pick conflict resolution from the CLI 2023-06-12 15:34:15 -07:00
Maximilian Hoffman
7db9bf2d42 [no-release-notes] Silent error during forkExec if empty trailing arg (#6141) 2023-06-12 15:29:17 -07:00
Pavel Safronov
e85f8dbcf2 Create the batsee output directory if one doesn't exist yet. 
Also adding the output directory to .gitignore.
 2023-06-12 15:11:28 -07:00
Zach Musgrave
5020fa20ee New interface method to return underlying dolt dbs from a SqlDatabase implementation (rather than type switch) 2023-06-12 14:22:56 -07:00
Jason Fulghum
4d29dce2a3 Helper methods for testing MergeStat conflict/violation status 2023-06-12 13:42:04 -07:00
Jason Fulghum
81a5554601 Differentiating between schema and content conflicts in merge command line output 2023-06-12 13:41:26 -07:00
Jason Fulghum
de01d65f78 cherry pick command line merge support 2023-06-12 13:40:06 -07:00
zachmu
1c5abe3bd0 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-12 20:38:58 +00:00
Zach Musgrave
83cb087964 Fixed tests 2023-06-12 13:27:44 -07:00
Zach Musgrave
680fae917f Merge branch 'main' into zachmu/docs 2023-06-12 12:54:48 -07:00
Jason Fulghum
687ecd4536 cherry-pick --abort support 2023-06-12 12:53:08 -07:00
max-hoffman
b88d75e7a1 [ga-bump-dep] Bump dependency in Dolt by max-hoffman 2023-06-12 18:56:11 +00:00
zachmu
08370a172c [ga-bump-release] Update Dolt version to 1.4.0 and release v1.4.0 v1.4.0 2023-06-12 17:45:06 +00:00
jennifersp
7922e0bacb update maven version for orm tests (#6137) 2023-06-12 08:45:52 -07:00
Pavel Safronov
490a6a5a2c Merge pull request #6011 from dolthub/pavel/dolt-status 2023-06-11 12:28:22 -10:00
Pavel Safronov
dbd5262b9d Change a BATS test to no longer check for an non-terminal error that may get logged. 2023-06-10 17:56:38 -07:00
Pavel Safronov
3e730bdc55 Another test fix. 2023-06-10 16:56:50 -07:00
Pavel Safronov
b75e7b989e Another test fix for modified dolt table. 2023-06-10 16:32:10 -07:00
Pavel Safronov
506cd2dfa8 Fix a test. 2023-06-10 15:56:10 -07:00
Pavel Safronov
03f5065981 Fix issue where "nothing to commit" message wasn't popping up. 
Change what remote information we return about a branch, use this in `dolt status`.
 2023-06-10 15:41:39 -07:00
Dustin Brown
026a69677e [ga-bump-dep] Bump dependency in Dolt by jennifersp (#6135) 2023-06-09 20:53:10 -07:00
Zach Musgrave
a4c7fa2700 Merge pull request #6122 from dolthub/zachmu/transactionsisyphus 
Re-merge of #5968 (transactions and db naming)
 2023-06-09 20:48:56 -07:00
Jason Fulghum
fa8cc6940f Merge pull request #6134 from dolthub/fulghum/kill-python 
[no-release-notes] Small simplification to `wait_for_connection` function
 2023-06-09 20:00:13 -07:00
zachmu
66954c46f7 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-06-10 02:47:17 +00:00
Zach Musgrave
cb7cea8b34 fixed setting head ref vars 2023-06-09 19:21:50 -07:00
Zach Musgrave
c617713c66 Fixed test (batch handling apparently broken 2023-06-09 18:13:15 -07:00