cf4362c252
PR feedback
2023-09-21 13:17:37 -07:00
4aa83b4a03
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-09-20 21:27:06 +00:00
a15266317c
Merge branch 'main' into zachmu/gms-update
2023-09-19 09:58:15 -07:00
25c1cb3b3c
Interface change
2023-09-15 18:19:08 -07:00
843a111bb1
go/libraries/doltcore/sqle/dtables: branch_namespace_control: Fix deadlock in reworked branch_control locking.
2023-09-15 10:26:47 -07:00
73b7c6a402
Interface changes
2023-09-01 12:08:03 -07:00
92945d11b6
Merge branch 'main' into fulghum/schema-merge
2023-08-22 13:22:37 -07:00
029fa4ba81
dolt_status pks, track merged tables and show in dolt_status
2023-08-22 10:12:09 -07:00
642dc871b6
Merge remote-tracking branch 'origin/main' into taylor/dolt-status
2023-08-18 13:04:01 -07:00
658358b91e
Messy first pass on schema merge support for more automatic type conversions (e.g. varbinary to BLOG, and varchar to TEXT.
2023-08-16 12:41:28 -07:00
4b86b73a39
Fixed Full-Text merge bug, removed pseudo-index tables from view
2023-08-10 04:17:59 -07:00
c2dd282321
Show if merge is active after resolving conflicts
2023-08-08 16:02:26 -07:00
98cf51d89f
Logging a SQL session warning when a historical value is out of range for the table's current schema.
2023-08-04 14:37:09 -07:00
f61fe10523
Bug fix and tests for https://github.com/dolthub/dolt/issues/6391
2023-07-26 17:03:16 -07:00
bab16e35c0
chore: fmt modify
2023-06-27 17:00:01 +08:00
d2ec6cf54d
Deleted batched tests and ripped out batch writer logic
2023-06-12 16:20:54 -07:00
490a6a5a2c
Merge pull request #6011 from dolthub/pavel/dolt-status
2023-06-11 12:28:22 -10:00
03f5065981
Fix issue where "nothing to commit" message wasn't popping up.
...
Change what remote information we return about a branch, use this in `dolt status`.
2023-06-10 15:41:39 -07:00
34e661749a
Rewrite dolt status subcommand to use SQL queries to generate results.
...
This change adds `remote` column to the `dolt_branches` table. This column identifies the remote for the branch.
This change adds `dolt_count_commits` function, which returns the number of commits between two commits.
Added more BATS tests for `dolt status`.
2023-06-09 15:52:35 -07:00
0b52f6c424
Revert "Revert "Merge pull request #5968 from dolthub/zachmu/tx-6""
...
This reverts commit bb03b8cb25
2023-06-08 11:09:54 -07:00
bb03b8cb25
Revert "Merge pull request #5968 from dolthub/zachmu/tx-6"
...
This reverts commit 51c2129e519692f6ef92
2023-06-07 17:27:06 -07:00
bff42f81fc
Merge main
2023-06-02 13:08:13 -07:00
0bfd57ae4d
[no-release-notes] Pushdown refactor, deprecate sql.FilteredTable, ColumnDiffTable correctness ( #6024 )
...
* [no-release-notes] Pushdown refactor, deprecate sql.FilteredTable,
ColumnDiffTable correctness
Pushdown splitting into two phases uncovered bugs. sql.FilteredTable
is now deprecated. ColumnDiffTable correctness tests were never run
through the indexing path before, which are broken. This disables the
indexing path and runs the proper test suites.
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* bump
* tidy
* missing interface method
* mod tidy
* formatter
---------
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com >
2023-05-24 16:32:20 -07:00
8623a7e002
Merge main
2023-05-24 15:56:43 -07:00
55eab2d7d4
Tidying up tests
2023-05-22 13:03:00 -07:00
aec48f6ab7
More errors from merge
2023-05-18 18:32:09 -07:00
132acf228a
merge main
2023-05-18 18:19:50 -07:00
6af53091ee
Merge branch 'main' of github.com:dolthub/dolt into nicktobey/detached_head
2023-05-17 11:18:12 -07:00
b45648ca4f
Merge main
2023-05-11 16:53:25 -07:00
8a13712ba9
Plugging in revision qualified names in more places
2023-05-11 16:12:02 -07:00
f09f2172ed
Fixed instances of GetHeadCommit
2023-05-11 15:57:07 -07:00
560eb45754
Clean up remaining unchecked uses of dbState.WorkingSet
2023-05-11 13:12:28 -07:00
29ed451728
go/store/prolly: rename 'their' fields to 'source' to clarify artifact map semantics
2023-05-10 13:53:00 -07:00
75c0b505e5
go/{merge, sqle, prolly}: Added NOT NULL constraints to constraint violations table
2023-05-09 15:47:47 -07:00
c1a3768493
Added "read" permission to branch control, now force longest match and denial rules
2023-05-04 15:14:13 -07:00
6800b9ebfc
Massaging the branch state interface
2023-05-02 09:35:06 -07:00
cf170cb0f3
Moving write session behind a getter
2023-04-28 16:53:02 -07:00
ed076afacf
Beginning to encapsulate db state behind getters
2023-04-28 16:49:51 -07:00
3d4dd5785c
Merge pull request #5809 from dolthub/nicktobey/doltignore
...
Add `dolt_ignore` system table.
2023-04-27 22:22:05 -07:00
836cca9c3c
Added todo about simplifying table creation logic in ignore_table.go
2023-04-27 16:03:38 -07:00
01b40f62eb
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-04-27 18:45:09 +00:00
52281a1c5a
Fix static-time type checking in ignore_table.go
2023-04-27 11:38:28 -07:00
2bb9bfd1e9
dolt_branches has transactional reads
2023-04-26 17:06:06 -07:00
598f3dc48c
Fetch refs from transaction start root
2023-04-26 15:56:00 -07:00
f0245299bf
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-04-26 18:40:22 +00:00
67f2461be6
Merge branch 'main' of github.com:dolthub/dolt into nicktobey/doltignore
2023-04-26 11:08:57 -07:00
6b9ce1f270
Add tags for dolt_ignore in reserved_tags.go
2023-04-26 10:59:49 -07:00
1bfe045d2f
go/doltcore/{merge,sqle}: populate description column for dolt_schema_conflicts table
2023-04-25 15:29:59 -07:00
e7005851d6
Pass in the backing table to the IgnoreTable constructor. This allows us to have the backing table be the same name as the system table.
2023-04-25 14:34:30 -07:00
1107eb4fd0
In the backing table, ignored should not have a default value.
2023-04-25 14:05:48 -07:00
Zach Musgrave