mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-28 18:30:02 -06:00
Code Issues Packages Projects Releases 139 Wiki Activity
22,328 Commits 135 Branches 609 Tags
402a30d0d771ccd0d98ac9dfd34b23f4e21dbe73
Commit Graph

14762 Commits

Author SHA1 Message Date
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
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
macneale4
c596e164bc [ga-bump-release] Update Dolt version to 1.29.4 and release 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
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 2023-12-09 00:23:55 +00: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
98be638250 simplify out of date check 2023-12-08 11:39:18 -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
nicktobey
987f8aa220 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-12-08 05:55:10 +00:00
Nick Tobey
b7a7944b2f Remove redundant test. 2023-12-07 21:48:14 -08:00
Nick Tobey
e37867e341 Add license docstring. 2023-12-07 21:48:00 -08:00
Stephanie You
625d249e42 check for new releases if build version is ahead of stored latest release 2023-12-07 16:50:58 -08:00
Aaron Son
076f51acca Merge pull request #7123 from dolthub/aaron/import-supports-bom 
dolt table import: json,csv: Support BOM file headers.
 2023-12-07 16:41:44 -08:00
Jason Fulghum
01953beea4 Fixing license file 2023-12-07 16:41:24 -08:00
Jason Fulghum
7afabd4d62 Removing old TODO 2023-12-07 16:40:23 -08:00
Jason Fulghum
b9f8ededfc Merge branch 'main' into fulghum/reflog 2023-12-07 16:28:08 -08:00
Jason Fulghum
a734b2e231 Updating GMS dep to latest dev build from fulghum/dolt-7040 branch 2023-12-07 16:27:07 -08:00
Jason Fulghum
09b57c4dd6 Merge branch 'main' into fulghum/dolt-7040 2023-12-07 16:23:51 -08:00
Aaron Son
04bd70ad2e dolt table import: json,csv: Support BOM file headers. 
The semantics are as follows:

For CSV files, the default import is an uninterpreted character encoding where
newline has to match 0xa and the delimeters have to match. In general Dolt
expects UTF8, but non-UTF8 characters in string fields can make it through to
the imported table for encodings which are close enough to ASCII, for example.
If there is a UTF8, UTF16LE or UTF16BE BOM header, then character decoding of
the input stream switches to the indicated encoding.

For JSON files, the default import is UTF8 character encoding. If there is a
UTF8, UTF16LE or UTF16BE BOM header, then character decoding of the input
stream switches to the indicated encoding.
 2023-12-07 15:06:22 -08:00
Jason Fulghum
c8c1ab19fb Re-running godeps/update.sh to update LICENSES after CI check failed: https://github.com/dolthub/dolt/actions/runs/7134858496/job/19430483715?pr=7104 2023-12-07 15:03:39 -08:00
macneale4
e899f7abcc [ga-bump-release] Update Dolt version to 1.29.2 and release v1.29.2 2023-12-07 22:38:32 +00:00
Jason Fulghum
5bbca39748 Updating GMS dep to latest dev build from fulghum/dolt-7040 branch 2023-12-07 14:38:02 -08:00
Jason Fulghum
fca1ec3d07 Merge branch 'main' into fulghum/dolt-7040 2023-12-07 14:34:42 -08:00
Neil Macneale IV
282993a247 Merge pull request #7122 from dolthub/macneale4/checkout-B 
Add support for -B flag to dolt_checkout

https://github.com/dolthub/dolt/issues/7116
 2023-12-07 14:31:21 -08:00
Dustin Brown
80037bcffc [auto-bump] [no-release-notes] dependency by jennifersp (#7112) 2023-12-07 13:33:07 -08:00
Neil Macneale IV
02d11b98d1 Fix logical mistake on -t and -b being exclusive 2023-12-07 13:03:13 -08:00
stephanie
e894937c0c Merge pull request #7105 from dolthub/steph/version 
Add of out date warning to `dolt version`
 2023-12-07 12:51:47 -08:00
Neil Macneale IV
3e7f3e3542 Add CLI support for checkout -B 2023-12-07 11:15:08 -08:00
Neil Macneale IV
ef67ced9df Added engine tests for -B flag in dolt_checkout 2023-12-07 11:15:08 -08:00
Neil Macneale IV
3a226fcd83 dolt checkout -B added. untested, existing tests pass 2023-12-07 11:15:08 -08:00
Stephanie You
07899db4b1 fix error handling 2023-12-07 11:03:55 -08:00
Jason Fulghum
09540a6644 PR Feedback: adding a missing check for prefixLength==0 2023-12-07 10:46:24 -08:00
timsehn
dccf01333b [ga-bump-release] Update Dolt version to 1.29.1 and release v1.29.1 2023-12-07 16:54:18 +00:00
Nick Tobey
19864c7d12 Improve docstring for ThreeWayDiffInfo. 2023-12-06 17:41:37 -08:00
Nick Tobey
32afb625cb In type compatibility, separate out invalidating secondary indexes from rewriting all rows: sometimes we want to do one but not the other. 
In the case of collation changes, we need to rebuild secondary indexes, but the primary index rows are unchanged.
 2023-12-06 17:41:37 -08:00
Nick Tobey
de8b2dfb1b Allow merging of a column if one side changes collation (but rebuild secondary indexes). This still only allows one column or the other to have a changed definition. 2023-12-06 17:41:37 -08:00
Nick Tobey
f6bcca2f23 Add collation change tests to schema merge tests. 2023-12-06 17:41:33 -08:00