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

2219 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
20df6696da add dolt commit bats test with multiple branches 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
779fb51f81 minor fixes for dolt commit 2023-06-16 16:42:48 -07:00
Stephanie You
9d85a26a30 add dolt commit bats tests 2023-06-16 16:42:48 -07:00
Stephanie You
82c59d363a update remote dolt commit bats test 2023-06-16 16:42:48 -07:00
Stephanie You
793af67bb0 adds remote test for dolt commit 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
Zach Musgrave
5d56fe3c6d Fixed test that was using -databases 2023-06-16 13:43:55 -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
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
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
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
4c9618c836 Fixed remaining bats test 2023-06-13 15:49:37 -07:00
Jason Fulghum
11e007593c Fixing node client test 2023-06-13 14:57:56 -07:00
Zach Musgrave
0284e3b04b Fixed test 2023-06-13 14:12:07 -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
558bdca26d Fixing node client test 2023-06-13 14:00:17 -07:00
Jason Fulghum
cb4a50acc0 Cleaning up BATS tests 2023-06-13 12:45:31 -07:00
Zach Musgrave
ea6c8abe91 Fix more tets 2023-06-13 12:35:10 -07:00
Jason Fulghum
b7588dfa99 Tidying up 2023-06-13 12:18:13 -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
jennifersp
6f3cb6f1b1 Update ORMDockerfile 2023-06-12 20:51:13 -07:00
Jason Fulghum
ce34ba3c37 Tidying up 2023-06-12 19:20:54 -07:00
Jason Fulghum
627ae1cc6d Fixing table rename test 2023-06-12 16:01:06 -07:00
Jason Fulghum
f7e02f28a5 BATS tests for cherry-pick conflict resolution from the CLI 2023-06-12 15:34:15 -07: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
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
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
Zach Musgrave
2525de307d Tests for USE of non-dolt dbs 2023-06-09 17:58:32 -07:00
Zach Musgrave
4c87dfa68e Skipped broken test 2023-06-09 16:49:39 -07:00
Pavel Safronov
ce0d4cf9a6 Update sql-server.bats to explicitly specify a user when calling dolt status. 2023-06-09 15:52:35 -07:00
Pavel Safronov
a0d7a155f5 PR feedback: 
- remove extraneous BATS checks
- add more tests
- add correct copyright notice to new procedure
 2023-06-09 15:52:35 -07:00
Pavel Safronov
cc9e4c4a25 PR feedback: 
- use (slightly) more expressive identifiers
- check remote output vs local output
- split up the logic of createPrintData into smaller functions
 2023-06-09 15:52:35 -07:00
Pavel Safronov
34e661749a Rewrite dolt status subcommand to use SQL queries to generate results. 
This change adds `remote` column to the `dolt_branches` table. This column identifies the remote for the branch.
This change adds `dolt_count_commits` function, which returns the number of commits between two commits.
Added more BATS tests for `dolt status`.
 2023-06-09 15:52:35 -07:00
Zach Musgrave
d0e20d5613 Merge main 2023-06-09 14:41:55 -07:00
Jason Fulghum
8b5bee4445 Merge branch 'main' into fulghum/kill-python 2023-06-09 14:32:16 -07:00
Zach Musgrave
11906fcc3a Fixed error message 2023-06-09 13:41:40 -07:00
Zach Musgrave
aba3dcce81 fixed error message in bats tests 2023-06-09 13:23:28 -07:00
Jason Fulghum
ff08487763 Fixing missing "|| false" in BATS assertion 2023-06-09 12:43:28 -07:00
Jason Fulghum
549d6d3abd Fixing another broken test 2023-06-09 12:41:03 -07:00
Jason Fulghum
672c514017 Adding debug output 2023-06-09 11:35:48 -07:00