84d2b376a1
Merge pull request #6845 from dolthub/steph/silent-push-pull
...
add --silent option for push, pull, fetch
2023-10-19 09:50:59 -07:00
3688b8325e
Merge pull request #6834 from dolthub/steph/ls
...
migrate dolt ls to use sql queries
2023-10-19 09:50:47 -07:00
5364ef3786
JSON and stats interface refactor ( #6833 )
...
* JSON and stats interface refactor
* Fix some tests
* fix more tests
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* bump
* bump
* cleanup
* json keys are ordered
* bump
* keep ordered json string for CV types
---------
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com >
2023-10-18 20:29:31 -07:00
973e676a0e
Merge branch 'main' into steph/ls
2023-10-18 15:52:26 -07:00
ab4e12c023
add --silent option for push, pull, fetch
2023-10-18 15:48:30 -07:00
48f565111c
Merge pull request #6840 from dolthub/steph/merge-base
...
migrate dolt merge-base to use sql queries
2023-10-18 15:06:50 -07:00
bbe8070270
integration-tests/go-sql-server-driver: sql-server-cluster.yaml: Add a test for dolt_cluster_transition_to_standby when there are no dolt databases.
2023-10-18 14:40:24 -07:00
0fdc1553fa
address PR comments
2023-10-18 14:37:24 -07:00
fe084708b5
add remote test for dolt merge-base
2023-10-18 13:41:45 -07:00
e82fd5e9aa
fix failing bats tests
2023-10-18 12:12:23 -07:00
dbf8172b75
add remote test for dolt ls
2023-10-17 17:03:54 -07:00
a4ed2c2ba8
add bats tests for dolt ls
2023-10-17 17:03:54 -07:00
597c4d56cd
Merge pull request #6831 from dolthub/aaron/cluster-nondolt-replication-graceful-standby
...
go: sqle: cluster: When performing a graceful transition to standby, take mysql and dolt_branch_control replication state into account.
2023-10-17 16:50:32 -07:00
0c72ec5205
go: sqle: cluster: Take mysql and dolt_branch_control replication state into account when performing a graceful transition to standby.
2023-10-17 15:01:46 -07:00
5c01935f13
Fix bats
2023-10-17 13:40:02 -07:00
73f1bfabfa
Fix workbench tests
2023-10-17 10:48:37 -07:00
dbb0bf8e2b
Make dolt_docs system table function like dolt_ignore
2023-10-17 09:34:16 -07:00
c3a827c8a8
Add BATS tests for dolt_ignore AS OF
2023-10-16 17:04:36 -07:00
c107df2bc2
add --all flag for dolt push ( #6787 )
2023-10-14 12:36:25 -07:00
9c46436d24
[auto-bump] [no-release-notes] dependency by JCOR11599 ( #6814 )
...
* [ga-bump-dep] Bump dependency in Dolt by JCOR11599
* skip batch test
---------
Co-authored-by: JCOR11599 <jcor@ucsd.edu >
Co-authored-by: James Cor <james@dolthub.com >
2023-10-13 17:36:17 -07:00
36256bcdcc
Merge pull request #6774 from dolthub/steph/pull
...
migrate dolt pull to use sql queries
2023-10-13 15:25:17 -07:00
fa50b5ba78
address PR comments
2023-10-13 12:39:54 -07:00
961cdfbd4f
address PR comments
2023-10-13 01:15:41 -07:00
871fab1546
update bats tests
2023-10-13 01:12:59 -07:00
aab6972dad
Preventing dolt_checkout from creating new branches in read-only databases.
...
Fixes: https://github.com/dolthub/dolt/issues/6785
2023-10-12 13:37:09 -07:00
a437340821
Merge branch 'fulghum/undrop' into aaron/undrop-cluster-tests
2023-10-11 15:59:22 -07:00
d976b46b0d
PR Feedback: normalizing physical directory names when moving them to the dropped dbs directory, so that they will always match the logical name of the database when they are restored.
2023-10-10 14:12:20 -07:00
f5e1c03a6c
flip status code for merge with conflicts in bats tests
2023-10-09 15:09:58 -07:00
4f6e198558
address PR comments
2023-10-09 14:04:27 -07:00
d8c6d56bce
more pull options bats tests
2023-10-09 13:17:41 -07:00
aef2d199b4
unskip dolt pull --squash test
2023-10-09 10:29:29 -07:00
5ca6a19962
fix dolt pull --force to work properly
2023-10-08 20:55:19 -07:00
17c451c12e
Merge remote-tracking branch 'origin/main' into aaron/undrop-cluster-tests
2023-10-06 17:20:22 -07:00
dcc009509e
Merge remote-tracking branch 'origin/fulghum/undrop' into aaron/undrop-cluster-tests
2023-10-06 17:20:15 -07:00
de3eed8b73
go: sqle: cluster: Make users and grants replication respect dolt_cluster_ack_writes_timeout_secs.
2023-10-06 15:46:42 -07:00
6376098755
go: sqle: cluster: Make branch control replication respect dolt_cluster_ack_writes_timeout_secs
2023-10-06 14:33:33 -07:00
0edcf6c4ff
[no-release-notes] integration-tests,SysbenchDockerfile: Bump to golang 1.21.2 in Dockerfiles.
2023-10-06 10:45:32 -07:00
e82f0b8d51
[no-release-notes] integration-tests: Bump to golang 1.21.1 in Dockerfiles.
2023-10-06 10:31:37 -07:00
733c5fe793
[no-release-notes] integration-tests: Bump to golang 1.21 in Dockerfiles.
2023-10-06 10:23:48 -07:00
68a771bbca
Tidying up
2023-10-05 16:05:42 -07:00
7f486ab807
Merge pull request #6777 from dolthub/aaron/bump-go-1.21
...
go/go.mod: Require Go 1.21 in our go.mod.
2023-10-05 15:58:59 -07:00
b6f40a621d
Merge branch 'main' into fulghum/undrop
2023-10-05 14:09:55 -07:00
dd798b09f4
integration-tests/go-sql-server-driver/go.mod: Use golang 1.21.
2023-10-05 13:51:36 -07:00
3a8453b615
[auto-bump] [no-release-notes] dependency by JCOR11599 ( #6775 )
2023-10-05 13:28:31 -07:00
8ce8a924e7
add remote test for dolt pull
2023-10-04 18:53:58 -07:00
60bcded65f
update merge to return 1 when there are conflicts
2023-10-04 18:53:58 -07:00
039f0221dc
update pull to print proper merge stats
2023-10-04 18:53:58 -07:00
d6ab22bee7
migrate dolt pull to use sql queries
2023-10-04 18:53:58 -07:00
0a47b6f90a
add bats tests for pull
2023-10-04 18:53:58 -07:00
b21317a480
Merge branch 'main' into fulghum/undrop
2023-10-04 12:17:54 -07:00
stephanie