Commit Graph

22120 Commits

Author SHA1 Message Date
Aaron Son 67535bbda1 go/cmd/dolt: sql-server.lock/sql-server.info changes. PR feedback. 2023-11-30 12:01:43 -08:00
reltuk 8b74402ead [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-11-30 05:48:45 +00:00
Aaron Son 677c553c5c integration-tests/bats: Skip some tests where we use dolt init in SQL_ENGINE=remote-engine mode. 2023-11-29 21:42:03 -08:00
Aaron Son d3473c602c go/Godeps/update.sh. 2023-11-29 20:26:10 -08:00
Aaron Son 3b6ce07897 go/cmd/dolt: Explicitly mark --ignore-lock-file as deprecated. 2023-11-29 18:20:25 -08:00
Aaron Son 2e9546d902 integration-tests/go-sql-server-driver: sqlserver_lock_test.go: Add a test documenting the current odd behavior where you can run two sql-servers against the same directory if they have no DoltDBs. 2023-11-29 17:57:06 -08:00
Aaron Son 751840ea61 integration-tests/bats: Update bats tests for new sql-server.lock semantics. 2023-11-29 17:56:24 -08:00
Aaron Son 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
Aaron Son 634bdf3e30 integration-tests/go-sql-server-driver: sqlserver_lock_test.go: Add some integration tests for sql-server.lock file handling. 2023-11-29 14:28:04 -08:00
Aaron Son 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
Aaron Son 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
Aaron Son 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
Aaron Son e1d37213cc go/libraries/doltcore/env: Move the relevant *DBLock stuff into cmd/commands/sqlserver as LocalCreds. 2023-11-28 18:56:09 -08:00
Aaron Son 2ae990d6b1 go/libraries/doltcore/env: multi_repo_env.go: Remove Lock/Unlock/IsLocked from MultiRepoEnv. 2023-11-28 18:20:14 -08:00
Aaron Son cd03d381ed go/libraries/doltcore/sqlserver: Change GetRunningServer to only return the server, not the DBLock. 2023-11-28 17:47:05 -08:00
Aaron Son 8111143b6b go/libraries/doltcore/env: Remove MultiRepoEnv construct which took a set of paths and databases to load. 2023-11-28 17:39:24 -08:00
Aaron Son 6c47612ff7 go/libraries/doltcore/sqle: database_provider.go: Remove sql-server.lock handling in DatabaseProvider. 2023-11-28 17:36:25 -08:00
Aaron Son d440045b06 go/store/chunks: Add a way for a ChunkStore to report its ExclusiveAccessMode: Shared, ReadOnly or Exclusive. 2023-11-28 17:25:51 -08:00
Aaron Son 59f3de6a4f go/store/nbs: journal.go: Fix some nil dereference panics is rarely executed error handling code regarding a journal manifest in readOnly mode. 2023-11-28 17:03:10 -08:00
Neil Macneale IV 3c9d6342d3 [no-release-notes] hasher utility (#7059) 2023-11-28 16:42:03 -08:00
Dustin Brown 1a0499f67b [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7058)
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
2023-11-28 14:58:16 -08:00
jennifersp d3c4a9a444 remove dolt stored procedure aliases (#7054) 2023-11-28 10:33:23 -08:00
Nick Tobey 37c8b56616 Merge pull request #7042 from dolthub/nicktobey/schemamergetestsfix
Run nullness checking on merged rows during three-way merges.
2023-11-27 14:56:20 -08:00
JCOR11599 a35abc2187 [ga-bump-release] Update Dolt version to 1.28.2 and release v1.28.2 v1.28.2 2023-11-27 22:30:44 +00:00
Dustin Brown a30dededb3 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7053)
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
2023-11-27 14:06:55 -08:00
Aaron Son 597ad0e81c Merge pull request #7052 from dolthub/aaron/fix-splunk-for-stale-manifest-with-chunk-journal
[no-release-notes] go/store/cmd/noms: Change root to use config.(*Resolver).GetDatabase.
2023-11-27 12:56:51 -08:00
Neil Macneale IV 4a1c1e6e4a Remove unused functions from noms_root.go 2023-11-27 12:55:03 -08:00
Neil Macneale IV 2dc6fa7a8b Refresh the root on '/' 2023-11-27 12:54:57 -08:00
Aaron Son aa24a2f192 [no-release-notes] go/store/cmd/noms: Change root to use config.(*Resolver).GetDatabase. 2023-11-27 11:45:24 -08:00
Dustin Brown 00a919d121 [auto-bump] [no-release-notes] dependency by JCOR11599 (#7047) 2023-11-24 01:56:50 -08:00
Dustin Brown 9ceca1f317 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 (#7041)
Co-authored-by: JCOR11599 <jcor@ucsd.edu>
2023-11-22 23:50:53 -08:00
nicktobey 2ffd0cdf26 [ga-bump-release] Update Dolt version to 1.28.1 and release v1.28.1 v1.28.1 2023-11-23 03:27:22 +00:00
Nick Tobey 2df1cf352c Merge pull request #7044 from dolthub/nicktobey/idea
Track whether or not rows actually need to be remapped to the result schema.
2023-11-22 19:18:29 -08:00
Nick Tobey e60170d8d9 Track whether or not rows actually need to be remapped to the result schema. This prevents a bunch of expensive computation in places where it isn't necessary. 2023-11-22 17:46:44 -08:00
Nick Tobey c04ced8f9e Handle nullcheck checks for resolved edited rows in three-way merges. 2023-11-22 13:40:48 -08:00
Nick Tobey 94d037b529 Add tests for schema merging with constraints. 2023-11-22 13:40:44 -08:00
fulghum f400a12195 [ga-bump-release] Update Dolt version to 1.28.0 and release v1.28.0 v1.28.0 2023-11-22 01:02:35 +00:00
Jason Fulghum 13e29080f9 Merge pull request #7037 from dolthub/fulghum-0a2b9016
[auto-bump] [no-release-notes] dependency by fulghum
2023-11-21 17:01:30 -08:00
Jason Fulghum 3f90521272 Fixing BATS test after allowing TEXT/BLOB/JSON fields to accept a literal default value (for MariaDB compatibility) 2023-11-21 15:45:50 -08:00
fulghum 8e8b89dadb [ga-bump-dep] Bump dependency in Dolt by fulghum 2023-11-21 23:16:19 +00:00
Zach Musgrave f8e2371d24 Merge pull request #7024 from nustiueudinastea/concurrent-branches-map
Concurrent branches map
2023-11-21 11:47:39 -08:00
Alex Giurgiu 015efd4c53 reverting older ordering, changed during merge 2023-11-21 13:29:38 +02:00
Alex Giurgiu cab07b32c1 added the nil check when unmarshaling from json 2023-11-21 13:26:03 +02:00
Alex Giurgiu fb4275a65e Merge branch 'main' into concurrent-branches-map 2023-11-21 13:25:17 +02:00
Nick Tobey 9bc32d9db2 Merge pull request #6980 from dolthub/nicktobey/schemamerge
Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge.
2023-11-20 23:12:26 -08:00
Nick Tobey 6527d9d6e9 Update docstring for mergeProllyTableData 2023-11-20 21:52:22 -08:00
Nick Tobey 8cf2982898 Add comments explaining why we have to handle left-only diffs during three-way merge. 2023-11-20 21:49:41 -08:00
Neil Macneale IV dbb5ce3d2d Merge pull request #7023 from dolthub/macneale4/fix_dolt_fetch_pull
fix dolt fetch and dolt pull commands to properly authenticate
2023-11-20 20:32:04 -08:00
macneale4 aacfd0a673 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-11-21 02:46:35 +00:00
Neil Macneale IV 0780d4e496 Update tests for more descriptive messages 2023-11-20 18:39:42 -08:00