Commit Graph

23670 Commits

Author SHA1 Message Date
Zach Musgrave
f28be4cf2c Bug fix for pull leaving working set dirty when it's already up to date 2024-05-20 18:04:20 -07:00
Zach Musgrave
935e7654c4 Repro for bad pull behavior when already up to date 2024-05-19 17:13:29 -07:00
Zach Musgrave
4d98a052c8 Attempt to repro bug, nothing yet 2024-05-19 15:05:38 -07:00
coffeegoddd
26e1d5b1c3 [ga-bump-release] Update Dolt version to 1.38.1 and release v1.38.1 v1.38.1 2024-05-17 22:21:22 +00:00
James Cor
b1dfd7521e keep sql.Schema for conflicts table schema (#7877) 2024-05-17 14:48:02 -07:00
Jason Fulghum
c4695cefcd Merge pull request #7876 from dolthub/fulghum/dolt-7875
Improve error messages for CLI commands when a sql-server is running
2024-05-17 14:37:34 -07:00
Jason Fulghum
0ccc3349b6 Adding tests for dolt CLI error messages in an uninitialized directory where a sql-server is running 2024-05-17 12:13:13 -07:00
Jason Fulghum
59b61de70e Customizing the error message for dolt init when a sql-server is already running from the directory 2024-05-17 11:44:06 -07:00
Jason Fulghum
c490affcbb Changing the command line to identify a valid dolt repository by looking for .dolt/noms instead of just .dolt
Related to https://github.com/dolthub/dolt/issues/7873
2024-05-17 11:36:40 -07:00
Dustin Brown
3446e28ea5 [ga-bump-dep] Bump dependency in Dolt by jycor (#7871)
Co-authored-by: jycor <jcor@ucsd.edu>
2024-05-16 00:14:10 -07:00
Dustin Brown
52f544958f [ga-bump-dep] Bump dependency in Dolt by jycor (#7869)
Co-authored-by: jycor <jcor@ucsd.edu>
2024-05-15 23:08:23 -07:00
Brian Hendriks
1586515b74 Merge pull request #7866 from dolthub/bh/update-release
update release process for new config refactor
2024-05-15 15:08:21 -07:00
James Cor
f3f72dc6eb [no-release-notes] fix unit test (#7865) 2024-05-15 14:47:07 -07:00
Brian Hendriks
736d87243c update release process for new config refactor 2024-05-15 13:59:56 -07:00
Brian Hendriks
ea6144bf1d Merge pull request #7864 from dolthub/bh/move-sqlserver-config
move config
2024-05-15 13:54:03 -07:00
Brian Hendriks
9adb85191b test fix 2024-05-15 13:23:31 -07:00
Brian Hendriks
6e1993852b formatting 2024-05-15 13:00:43 -07:00
Brian Hendriks
e2d2570da0 remove unneeded struct 2024-05-15 12:58:29 -07:00
Brian Hendriks
cbdd20c981 extra debug info 2024-05-15 11:53:41 -07:00
Brian Hendriks
2df73a6aa0 extra debug info 2024-05-15 11:50:58 -07:00
Jason Fulghum
e9f3991fdd Merge pull request #7860 from dolthub/fulghum/bugfix
Bug fix: load local config when using `--data-dir`
2024-05-15 11:34:28 -07:00
Jason Fulghum
5a627e5a93 Merge pull request #7862 from dolthub/fulghum/bugfix-2
Bug fix: `sql-server` should initialize persisted global vars
2024-05-15 11:34:16 -07:00
Maximilian Hoffman
eb4ba21086 [nbs] safer root hash record peek (#7858) 2024-05-15 11:11:39 -07:00
Brian Hendriks
2e6b5a5452 formatting 2024-05-15 10:33:40 -07:00
Brian Hendriks
b6cd726af3 move config 2024-05-15 10:27:16 -07:00
Jason Fulghum
51edd8decb Bug fix: dolt sql-server should initialize persisted global variables from its local config store 2024-05-14 16:52:17 -07:00
Maximilian Hoffman
4a0f03dfe2 [dsess] session trigger cache (#7846)
* [dsess] session trigger cache

* fix bug
2024-05-14 12:57:35 -07:00
Dustin Brown
92c3d43728 [ga-bump-dep] Bump dependency in Dolt by jycor (#7861)
Co-authored-by: jycor <jcor@ucsd.edu>
2024-05-14 12:44:51 -07:00
Jason Fulghum
2c7ad5913b Bug fix: loading local config when using --data-dir 2024-05-14 11:15:49 -07:00
Daylon Wilkins
eb86db5dba Merge pull request #7848 from dolthub/daylon/dg-root
Added additional function to RootValue
2024-05-14 04:09:01 -07:00
Daylon Wilkins
59d2f64620 Added additional function to RootValue 2024-05-14 03:34:53 -07:00
Jason Fulghum
0f70ca7a9d Merge pull request #7852 from dolthub/fulghum-0e38605f
[auto-bump] [no-release-notes] dependency by fulghum
2024-05-13 17:07:40 -07:00
Jason Fulghum
8c315efb28 Removing second show warnings call in branch control block on write replication test 2024-05-13 16:10:34 -07:00
Jason Fulghum
6386ad810c Making wait_for_connection timeouts consistent to try and prevent timeouts in lambda execution 2024-05-13 15:03:34 -07:00
fulghum
91abc75a54 [ga-bump-dep] Bump dependency in Dolt by fulghum 2024-05-13 21:14:40 +00:00
coffeegoddd
4b7710fe33 [ga-bump-release] Update Dolt version to 1.38.0 and release v1.38.0 v1.38.0 2024-05-10 22:23:02 +00:00
Dustin Brown
a9526f7154 [ga-bump-dep] Bump dependency in Dolt by max-hoffman (#7844)
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com>
2024-05-10 14:49:18 -07:00
James Cor
3da0749477 handle database charset/collation changes (#7823) 2024-05-10 13:18:19 -07:00
Jason Fulghum
1c948d1ea5 Merge pull request #7764 from dolthub/dependabot/go_modules/go/golang.org/x/net-0.23.0
Bump golang.org/x/net from 0.17.0 to 0.23.0 in /go
2024-05-09 21:38:55 -07:00
Nick Tobey
573ef85afe Merge pull request #7803 from dolthub/nicktobey/js2
Avoid escaping HTML characters when displaying them to the user.
2024-05-09 21:09:34 -07:00
Jason Fulghum
535460aed9 bumping x/crypo|sys for sql-server integ tests 2024-05-09 19:41:22 -07:00
Jason Fulghum
e96e4dcea2 bumping x/net|sys|text in go/gen/proto/dolt/services/eventsapi 2024-05-09 17:28:50 -07:00
Jason Fulghum
2fc6d50209 Merge branch 'main' into dependabot/go_modules/go/golang.org/x/net-0.23.0 2024-05-09 17:20:35 -07:00
Nick Tobey
8e40551186 Merge remote-tracking branch 'origin/main' into nicktobey/js2 2024-05-09 10:55:49 -07:00
jennifersp
12335605bc use parser interface in engine (#7819) 2024-05-09 10:21:40 -07:00
Nick Tobey
2288abefde Fix bats test. 2024-05-08 23:26:16 -07:00
Nick Tobey
4b66a86462 Avoid escaping HTML characters when displaying them to the user. 2024-05-08 17:04:24 -07:00
nicktobey
18f8819992 [ga-bump-dep] Bump dependency in Dolt by nicktobey 2024-05-09 00:01:54 +00:00
coffeegoddd
05c1a9df00 [ga-bump-release] Update Dolt version to 1.37.0 and release v1.37.0 v1.37.0 2024-05-08 23:06:32 +00:00
Nick Tobey
a8eb4e0c3f Merge pull request #7821 from dolthub/nicktobey/schema-merge
Prevent panic when dropping columns in schema merge.
2024-05-08 15:56:01 -07:00