mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-13 11:09:10 -05:00
Code Issues Packages Projects Releases 146 Wiki Activity
22,359 Commits 158 Branches 616 Tags
0fbfd0d80a8bbe02abbee699c5693b72b990c75d
Commit Graph

22359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Son
0fbfd0d80a go: sqle: cluster: Create missing remotes for cluster replication on startup if they do not already exist. 
Previously `dolt sql-server` would error if there were existing databases and
they were missing any of the remotes listed as cluster replication remotes in
the config.yaml. This changes it so that those remotes are automatically
created at startup instead.
 2023-12-15 12:49:11 -08:00
Jason Fulghum
3c0b84760a Merge pull request #7161 from dolthub/fulghum/tx-conflict-error 
Return a different error message for tx commit conflicts depending on `@autocommit`
 2023-12-15 08:35:17 -08:00
Aaron Son
72c61a897a Merge pull request #7173 from dolthub/aaron/sqle-cluster-multiple-standbys-mysqldb-and-branch-control-fix 
go: sqle: cluster: Fix MySQLDb and dolt_branch_control replication for the cases where you have more than one standby server in the cluster.
 2023-12-14 16:58:01 -08:00
Aaron Son
f8cfe84b99 Merge pull request #7176 from dolthub/aaron/sysbench-dockerfile-workaround 
[no-release-notes] go/performance/continuous_integration: SysbenchDockerfile: Attempt to work around MySQL expired GPG key.
 2023-12-14 16:57:42 -08:00
Aaron Son
9c9419c9e8 [no-release-notes] go/performance/continuous_integration: SysbenchDockerfile: Attempt to work around MySQL expired GPG key. 2023-12-14 16:54:13 -08:00
Aaron Son
14efec1153 go: sqle: cluster: Fix MySQLDb and dolt_branch_control replication for the cases where you have more than one standby server in the cluster. 
Previously these changes would only get replicated to the first database in the cluster.
 2023-12-14 15:11:31 -08:00
Zach Musgrave
2c32f8dc8f Merge pull request #7124 from dolthub/zachmu/server 
[no-release-notes] Refactored server initialization code
 2023-12-14 09:57:36 -08:00
Dustin Brown
90b9bfe89a [ga-bump-dep] Bump dependency in Dolt by jennifersp (#7160) 
Co-authored-by: jennifersp <44716627+jennifersp@users.noreply.github.com>
 2023-12-14 09:40:15 -08:00
Jason Fulghum
8de95600dd Updating merge conflict error messages in BATS tests 2023-12-14 06:30:29 -08:00
zachmu
c7adeb9cd8 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-12-14 01:48:29 +00:00
Zach Musgrave
bf6f4efa51 Merge branch 'main' into zachmu/server 2023-12-13 17:41:42 -08:00
Zach Musgrave
bf406b5af8 Refactored ServerConfigFromArgs to take an arg parser and help printer 2023-12-13 17:04:53 -08:00
Jason Fulghum
f214663744 Returning a different error message for tx commit conflicts depending on whether @autocommit is enabled or not 2023-12-13 16:58:52 -08:00
Aaron Son
64c353bf92 Merge pull request #7153 from dolthub/aaron/bump-flatbuffers-all-Try-accessors 
proto/third_party/flatbuffers,go/gen/fb/serial: Bump flatc to pick up the version that only has Try accessors.
 2023-12-13 15:30:28 -08:00
fulghum
af8978211f [ga-bump-release] Update Dolt version to 1.29.5 and release v1.29.5 v1.29.5 2023-12-13 22:01:38 +00:00
Jason Fulghum
eaae9be969 Merge pull request #7159 from dolthub/fulghum/dolt-blame 
Bug fix: `dolt_blame_<tablename>` view should backtick quote identifiers
 2023-12-13 13:54:20 -08:00
Zach Musgrave
96ad08ea28 Added a UrlStr method to doltEnv 2023-12-13 13:42:54 -08:00
Jason Fulghum
de8e5a8c9a Fixing the dolt_blame_<tablename> view to backtick quote identifiers in case they need it 2023-12-13 12:12:01 -08:00
Aaron Son
d561eb5bdf proto/third_party/flatbuffers,go/gen/fb/serial: Bump flatc to pick up the version that only has Try accessors. 2023-12-12 18:02:39 -08:00
Aaron Son
561f3aa652 Merge pull request #7151 from dolthub/aaron/flatbuffer-try-usage 
go: Migrate to always use Try accessors on flatbuffer submessage access.
 2023-12-12 17:58:03 -08:00
Dustin Brown
d7678ab584 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7150) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2023-12-12 16:17:18 -08:00
stephanie
402a30d0d7 Merge pull request #7143 from dolthub/steph/version-fix 
Poorly formatted version doesn't error
 2023-12-12 15:07:39 -08:00
reltuk
0b2b4ffae2 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-12-12 23:01:19 +00:00
Aaron Son
319f2abb15 go: Migrate to always use Try accessors on flatbuffer submessage access. 2023-12-12 14:54:30 -08:00
James Cor
81a6e152c1 fix column_diff_table for modifed json columns (#7145) 
* fix modifying json columns in diff tables

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

---------

Co-authored-by: James Cor <james@dolthub.com>
Co-authored-by: JCOR11599 <JCOR11599@users.noreply.github.com>
 2023-12-11 21:11:40 -08:00
Stephanie You
ee4490df38 change output check for bad version 2023-12-11 17:43:36 -08:00
macneale4
c596e164bc [ga-bump-release] Update Dolt version to 1.29.4 and release v1.29.4 v1.29.4 2023-12-12 00:58:32 +00:00
Dustin Brown
16f510d453 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7144) 
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
 2023-12-11 16:42:51 -08:00
Stephanie You
678da61ae6 better bats test for bad version error 2023-12-11 16:03:43 -08:00
stephanie
bcc3de03c9 Merge pull request #7136 from dolthub/steph/login-message 
Better messaging for `dolt login`
 2023-12-11 15:44:08 -08:00
Stephanie You
e37aa07463 strip newline characters from stored version 2023-12-11 15:09:30 -08:00
Stephanie You
c63435889a poorly formatted version doesnt error 2023-12-11 13:45:36 -08:00
Dustin Brown
a2de38e86e [ga-bump-dep] Bump dependency in Dolt by max-hoffman (#7142) 
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com>
 2023-12-11 13:23:05 -08:00
fulghum
980468e98a [ga-bump-release] Update Dolt version to 1.29.3 and release v1.29.3 v1.29.3 2023-12-09 00:23:55 +00:00
Jason Fulghum
e42353727a Merge pull request #7134 from dolthub/fulghum-7e16c712 
[auto-bump] [no-release-notes] dependency by fulghum
 2023-12-08 16:16:18 -08:00
Stephanie You
db9126c609 more readable formatting 2023-12-08 15:58:54 -08:00
Stephanie You
072f2b832a better messaging for dolt login 2023-12-08 15:20:23 -08:00
fulghum
5e46cad939 [ga-bump-dep] Bump dependency in Dolt by fulghum 2023-12-08 22:46:54 +00:00
stephanie
f7636e9e31 Merge pull request #7126 from dolthub/steph/version-fix 
fixes `dolt version` out of date warning
 2023-12-08 14:40:17 -08:00
Jason Fulghum
5f74b027b1 Merge pull request #7125 from dolthub/fulghum/reflog 
Clear out reflog contents consistently after GC
 2023-12-08 14:31:07 -08:00
Jason Fulghum
b90610224b Merge pull request #7131 from dolthub/fulghum-25f93d23 
[auto-bump] [no-release-notes] dependency by fulghum
 2023-12-08 13:16:04 -08:00
Stephanie You
cabcb8bc95 additional test 2023-12-08 11:52:39 -08:00
Stephanie You
98be638250 simplify out of date check 2023-12-08 11:39:18 -08:00
Zach Musgrave
d5c3d5e866 Merge branch 'zachmu/server' of github.com:dolthub/dolt into zachmu/server 2023-12-08 11:07:10 -08:00
Nick Tobey
d62d76c354 [no-release-notes] Merge pull request #7127 from dolthub/nicktobey/perf 
Disable performance bats test.
 2023-12-08 10:03:26 -08:00
Nick Tobey
5de8dbe6d1 Merge pull request #7118 from dolthub/nicktobey/collate_merge1 
Allow automatic merging in the presence of collation changes.
 2023-12-08 10:02:26 -08:00
Jason Fulghum
3eb8b5ffbb Merge branch 'main' into fulghum-25f93d23 2023-12-08 09:46:39 -08:00
fulghum
ea78d2ec26 [ga-bump-dep] Bump dependency in Dolt by fulghum 2023-12-08 17:36:11 +00:00
Jason Fulghum
38f084d64a Merge pull request #7104 from dolthub/fulghum/dolt-7040 
Feature: Support `BLOB/TEXT` columns in unique indexes, without requiring a prefix length
 2023-12-08 09:34:32 -08:00
Nick Tobey
f8ee7df4ca Add test that charset changes are not compatible for automatic merge resolution. 2023-12-07 22:04:19 -08:00