b82117d5c4
Merge remote-tracking branch 'origin/main' into steph/clone-branch
2023-12-05 16:51:16 -08:00
3e20220253
[auto-bump] [no-release-notes] dependency by max-hoffman ( #7102 )
...
* [ga-bump-dep] Bump dependency in Dolt by max-hoffman
* update hadoop
---------
Co-authored-by: max-hoffman <maximilian.wolfgang1@gmail.com >
Co-authored-by: Max Hoffman <max@dolthub.com >
2023-12-05 16:01:02 -08:00
c64e2b93af
Merge remote-tracking branch 'origin/main' into steph/clone-branch
2023-12-05 10:38:32 -08:00
f41d7cea48
[ga-bump-dep] Bump dependency in Dolt by JCOR11599 ( #7097 )
...
Co-authored-by: JCOR11599 <jcor@ucsd.edu >
2023-12-05 10:27:37 -08:00
6b54e53586
simplify single-branch logic
2023-12-05 09:53:02 -08:00
0972f6cf97
Merge pull request #7092 from dolthub/steph/gc
...
migrate `dolt gc` to use sql queries
2023-12-04 16:49:25 -08:00
e8ce41fee9
fix inf loop for creds on windows ( #7094 )
...
Co-authored-by: James Cor <james@dolthub.com >
2023-12-04 14:27:25 -08:00
e723577492
Merge pull request #7065 from dolthub/nicktobey/perf
...
Cache the computation of default columns during three-way merges.
2023-12-04 14:10:51 -08:00
69263ce4da
update doc string
2023-12-04 13:59:41 -08:00
3205ccea14
Merge remote-tracking branch 'origin/main' into steph/gc
2023-12-04 13:59:11 -08:00
279b40a96e
migrate dolt gc to use sql queries
2023-12-04 11:59:56 -08:00
1a4cd6ac9a
minor doc fixes
2023-12-04 10:22:38 -08:00
4ec6d2b9fe
PR comments
2023-12-04 10:00:58 -08:00
d73c8fd4d5
Merge branch 'main' into steph/reflog
2023-12-01 16:39:43 -08:00
7572724aa3
[no-release-notes] Unique ids cleanup bump ( #7086 )
...
* [no-release-notes] Unique ids cleanup bump
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* bump again
---------
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com >
2023-12-01 16:22:57 -08:00
90b62c8bd7
small fix
2023-12-01 15:51:44 -08:00
a99b52dc9e
small fix
2023-12-01 15:44:34 -08:00
be31b2852e
adds --single-branch for dolt clone
2023-12-01 15:29:01 -08:00
e2f18eedb9
Merge remote-tracking branch 'origin/main' into steph/reflog
2023-12-01 15:01:29 -08:00
b47eeb4dec
PR comments
2023-12-01 15:00:05 -08:00
80a8e1db48
[ga-bump-release] Update Dolt version to 1.29.0 and release v1.29.0
2023-12-01 21:19:21 +00:00
8f0818c11a
Merge pull request #7076 from dolthub/aaron/fix-some-spurious-retries-in-remotestorage
...
[no-release-notes] go/libraries/doltcore/remotestorage: Fix some spurious retries on authentication failures and the likes when interacting with remotestorage.
2023-12-01 13:06:34 -08:00
a2a2e90527
Merge pull request #7085 from dolthub/tbantle22-a3ee71b2
...
[auto-bump] [no-release-notes] dependency by tbantle22
2023-12-01 13:06:27 -08:00
1149e86632
[ga-bump-dep] Bump dependency in Dolt by tbantle22
2023-12-01 19:26:45 +00:00
a0c0fa6e51
Fix existant typo
2023-12-01 11:10:55 -08:00
18f65fbdf2
Merge pull request #7077 from dolthub/steph/sql-client-depre
...
remove dolt sql-client command
2023-12-01 10:17:55 -08:00
de1e666cd0
[no-release-notes] Unique ids bump ( #7067 )
...
* [no-release-notes] Unique ids bump
* bump
2023-11-30 21:38:39 -08:00
b977298464
Merge pull request #7069 from dolthub/aaron/new-sql-server-lock-semantics
...
go/cmd/dolt: Implement new semantics for sql-server.lock.
2023-11-30 18:03:55 -08:00
d135c4b95d
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-11-30 23:45:28 +00:00
9761372c98
move queryist utils into sqlserver package
2023-11-30 15:38:08 -08:00
bd045ae658
refactor queryist utils
2023-11-30 15:32:43 -08:00
9486e434bc
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-11-30 23:11:26 +00:00
86d12d7b8e
remove dolt sql-client command
2023-11-30 14:59:59 -08:00
5cfc7e482d
[no-release-notes] go/libraries/doltcore/remotestorage: Fix some spurious retries on authentication failures and the likes when interacting with remotestorage.
2023-11-30 14:58:05 -08:00
67535bbda1
go/cmd/dolt: sql-server.lock/sql-server.info changes. PR feedback.
2023-11-30 12:01:43 -08:00
e9c63acccd
another description update
2023-11-30 11:37:12 -08:00
0f2e9261e3
reflog doc update
2023-11-30 11:28:52 -08:00
18b96edd11
[no-release-notes] go/libraries/doltcore/env/actions: remotes.go: Small fix to SetHeadToCommit our local remote ref when pushing even in fast-forward mode.
2023-11-30 10:53:03 -08:00
8b74402ead
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-11-30 05:48:45 +00:00
d3473c602c
go/Godeps/update.sh.
2023-11-29 20:26:10 -08:00
5d24edd9ef
address PR comments
2023-11-29 18:43:36 -08:00
3b6ce07897
go/cmd/dolt: Explicitly mark --ignore-lock-file as deprecated.
2023-11-29 18:20:25 -08:00
804f1c1d8f
Merge pull request #7035 from dolthub/nicktobey/schemamerge4
...
Detect data conflicts even when one branch has the same binary representation as the ancestor.
2023-11-29 18:00:21 -08:00
ce5f98a655
Update go/libraries/doltcore/diff/diff_stat.go
...
Co-authored-by: Jason Fulghum <jason@dolthub.com >
2023-11-29 16:30:39 -08:00
044ae94050
go/cmd/dolt: dolt.go: Fix all the other commands which need a usedEnv/targetEnv that I accidentally broke.
2023-11-29 14:48:46 -08:00
082f5bf61e
go/cmd/dolt: dolt.go: Change the logic for when we look for sql-server access in a CLI invocation to be: look if we have a target dolt db and it is currently read only, or look if all the dolt dbs (possibly 0) in our loaded MulitEnv are read only.
2023-11-29 14:27:23 -08:00
3115ab7758
Precompute default column values during merge instead of computing once per row.
2023-11-29 12:44:04 -08:00
8174f31fb7
go/cmd/dolt/commands/sqlserver: server.go: Remove seemingly incorrect server.Close call in the session builder when we see a certain error.
2023-11-29 11:48:24 -08:00
99fa4f0a32
cmd/dolt: Implement new sql-server.lock semantics. Assert sql-server has write access to the databases it loads when it starts, look for the credentials file in parent directories.
2023-11-29 11:47:16 -08:00
6ba1d09cd8
change error test output
2023-11-29 11:34:12 -08:00
Stephanie You