2578 Commits

Author SHA1 Message Date
Zach Musgrave 2ddfcd5814 Merge pull request #2154 from dolthub/zachmu/session-rebase
Rebase the database on transaction start
2021-09-20 16:11:59 -07:00
Zach Musgrave 63f42a8c52 Merge pull request #2137 from dolthub/zachmu/sql-tx-commit
Made SQL commits involving a dolt commit atomic
2021-09-20 14:38:34 -07:00
Zach Musgrave be6a441ede Rebase on transaction start 2021-09-20 10:12:24 -07:00
Brian Hendriks b469648309 Update bulk_import_tea.go (#2152) 2021-09-20 09:25:53 -07:00
Zach Musgrave eb5364824b Formatting 2021-09-17 14:34:13 -07:00
Maximilian Hoffman 47a4640e4c no panic if HOME does not exist (#2148)
* no home dir exist

* dolt root can be empty

* move test to bottom

* dir -> directory

* Windows complaining about smth
2021-09-17 14:12:35 -07:00
Zach Musgrave ef86f36c7b Made an empty commit on DOLT_COMMIT an error again (still fine for auto dolt commit) 2021-09-17 12:50:35 -07:00
Dustin Brown 3c1ed88774 /go/libraries/doltcore/table/editor/bulk_import_tea.go: return errors not panics 2021-09-17 11:49:58 -07:00
Zach Musgrave e4f8bff12a Clear any merge before running rest of dolt commit logic 2021-09-16 17:09:48 -07:00
Zach Musgrave 4b9382064d Bug fixes 2021-09-16 16:49:16 -07:00
Brian Hendriks 3070d3af9f merge rows on dolt table import -u when import data only represents a subset of the columns (#2105) 2021-09-16 14:06:45 -07:00
Brian Hendriks d47096bb0b Import fix to not put NullValue into types.Tuples for map values (#2143) 2021-09-16 13:23:38 -07:00
Zach Musgrave 71311b1073 Merge pull request #2112 from abmyii/fk-violation-error-fmt
Only show key name, not column tag number
2021-09-16 13:19:57 -07:00
Andy Arthur f5551a3b69 pr feedback, make 'dolt config unset' case insensitive 2021-09-16 11:35:32 -07:00
Abdurrahmaan Iqbal 77833ba989 Only show key name, not column tag number 2021-09-16 19:25:24 +01:00
Andy Arthur 90010e8929 threading config for default branch 2021-09-16 11:24:07 -07:00
Andy Arthur d59e68bcae merged master 2021-09-16 10:30:41 -07:00
AndyA d6ba9e2764 Merge pull request #2131 from dolthub/andy/create-dolt-database
Create Dolt Database
2021-09-16 09:40:44 -07:00
Zach Musgrave 7b132eb07a Removed dirty check for transactions that do a dolt_commit (they are often not dirty) 2021-09-15 18:06:42 -07:00
Zach Musgrave 3e72f09187 Fix lingering issues 2021-09-15 17:39:53 -07:00
zachmu d42b976e5e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2021-09-16 00:28:55 +00:00
Zach Musgrave a05c7a5f44 Made dolt_commit return the commit hash as previously 2021-09-15 17:26:59 -07:00
Zach Musgrave d69e8ad3c8 Fixed bug in dolt commit logic 2021-09-15 17:07:51 -07:00
Zach Musgrave 870751fbc5 Fixed commit message in unit tests, still broken overall because of bugs 2021-09-15 10:43:14 -07:00
Zach Musgrave 5dbc747505 Use new dolt tx commit method in dolt_commit func 2021-09-15 10:34:44 -07:00
Zach Musgrave 64c5e1b77d Extracted a doCommitFunc to consolidate business logic for both tx commit paths 2021-09-15 10:30:30 -07:00
Zach Musgrave 4b084dfb0a More refactoring of dolt / ws transaction commit 2021-09-15 10:18:12 -07:00
Maximilian Hoffman 1cfdb7ed57 Fetch refactor (#2139)
* Fetch refactor

* fix localbs-remotes test

* another missed bats

* zach's comments
2021-09-14 17:24:16 -07:00
Andy Arthur faebb448d7 reverted changes to ref_spec.go 2021-09-14 11:52:47 -07:00
Andy Arthur d019aaba09 changed default branch param key, added tests 2021-09-14 11:48:24 -07:00
Zach Musgrave 84f045a510 Made dolt_commit function use the standard tx commit path, needs a little work 2021-09-14 11:21:02 -07:00
Zach Musgrave 0d8a04cae3 Refactored dolt commit in transaction commit to happen in the same write, rather than as a separate step 2021-09-14 10:54:46 -07:00
Zach Musgrave 715beb4b55 Couple small cleanups 2021-09-14 10:34:09 -07:00
Andy Arthur cf62c76545 remove clone inference method 2021-09-14 10:14:39 -07:00
Zach Musgrave 29c3e2a45a Refactored transaction commit code to make write function pluggable 2021-09-13 17:34:04 -07:00
Taylor Bantle df1898e6b1 Add tests 2021-09-13 17:19:15 -07:00
Taylor Bantle 75b542b9aa Andy feedback 2021-09-13 16:38:49 -07:00
Andy Arthur 704b8fcc0e corrected config param name 2021-09-13 16:20:00 -07:00
Andy Arthur e76b34024f attempt to determine default branch for clone 2021-09-13 16:14:59 -07:00
Andy Arthur add21045d8 tracking down references to 'master' 2021-09-13 15:45:07 -07:00
Andy Arthur 3c49f8447f initial pass at default init branch 2021-09-13 15:37:06 -07:00
Taylor Bantle ff52f78184 Support GetDiffsWithFilter for keyless tables 2021-09-13 13:48:49 -07:00
Zach Musgrave a7545939eb Merge pull request #2032 from dolthub/zachmu/transaction-merge
Method to add a commit and update working set together atomically
2021-09-13 13:12:43 -07:00
Andy Arthur 4c5464158b implementing new RepoStateReader/Writer methods 2021-09-13 12:36:19 -07:00
Andy Arthur effc8bffc9 Merge branch 'master' into andy/create-dolt-database 2021-09-13 12:27:23 -07:00
Andy Arthur 22dbb56182 pull latest GMS master 2021-09-13 12:24:38 -07:00
Maximilian Hoffman ef2df6761f add sql push and fetch (#2120)
* sql_pull compiles

* Fix sql-merge bats

* Fix merge bats tests, add pull

* Cleanup comments

* refactor fetch; inital dolt_fetch and dolt_push compile, untested

* push bats

* Fetch tests

* delete comments

* Better push status return

* PR touch ups

* Duplicate test name

* Zach's commentsg

* return push ErrUpToDate so cli can log

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2021-09-13 12:22:36 -07:00
Daylon Wilkins 49e451cb82 Fixed VRW reference issues 2021-09-13 11:16:40 -07:00
Andy Arthur c3aeffa07d cleanup 2021-09-13 11:09:00 -07:00
Andy Arthur e371616b02 added filter-branch whitebox integration tests 2021-09-13 11:00:01 -07:00