mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-05 16:15:41 -06:00
Code Issues Packages Projects Releases 115 Wiki Activity
22,332 Commits 41 Branches 585 Tags
561f3aa65232f1c2e7e126307e0fa8dd67136326
Commit Graph

22332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Nick Tobey
ef8a630f04 Disable performance bats test. 2023-12-07 20:06:25 -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 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