Commit Graph

13 Commits

Author SHA1 Message Date
elianddb
5db5aac06c add mariadb connectors for existing langs 2025-10-12 17:33:54 -07:00
elianddb
c38d3827c1 amend Dockerfile to embed interpreters from diff build stages
# Conflicts:
#	go/cmd/dolt/doltversion/version.go
#	go/go.mod
#	go/go.sum
2025-10-12 17:33:51 -07:00
Dustin Brown
d476dda8fd [auto-bump] [no-release-notes] dependency by jycor (#7693) 2024-04-05 01:23:11 -07:00
Nick Tobey
3eb8fc7a18 Merge pull request #6209 from dolthub/nicktobey/dolt-checkout
Migrate `dolt checkout` to new CLI framework.
2023-07-11 11:34:59 -07:00
James Cor
ea9839f524 return commit hash for dolt_merge() when --no-ff is not specified (#6281) 2023-07-10 02:12:01 -07:00
Nick Tobey
9251a898f6 Update mysql client tests to remove newline from expected responses. 2023-07-09 23:57:42 -07:00
Nick Tobey
3d8a949f6e Update mysql client tests for new dolt_checkout return value schema. 2023-07-06 11:26:07 -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
Daylon Wilkins
8aeb1c659e Removed deprecated dolt functions 2023-01-03 02:13:37 -08:00
Vinai Rachakonda
d26ce19444 Update Describe tests in Dolt due to bug in GMS (#3642) 2022-06-24 15:15:58 -04:00
Dhruv Sringari
6488344abb CALL DOLT_MERGE now returns fast_forward and conflicts status columns (#3564)
* CALL DOLT_MERGE now returns fast_forward and conflicts columns

* fix tests

* fix sql integration tests

* fix sql-merge.bats

* pr comment
2022-06-07 17:03:46 -07:00
Vinai Rachakonda
4a5a033c5d Expand Client Tests to include sql functions (#2303) 2021-10-29 10:18:38 -07:00
Dustin Brown
503665c32c /integration-tests: move mysql-client-tests to integration-tests 2021-03-15 12:53:14 -07:00