mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-05 10:31:30 -06:00
Code Issues Packages Projects Releases 126 Wiki Activity
8,051 Commits 84 Branches 596 Tags
d594bcdd8d8f448f84d8a004c438ced3068f5e4b
Commit Graph

13 Commits

Author SHA1 Message Date
Vinai Rachakonda
bde72c7d1a Ensure that MERGE() works properly with fast forward. (#1101) 
This pr fixes a bug where MERGE was not detecting FFs.
 2020-12-14 17:02:10 -05:00
VinaiRachakonda
28a2f08b19 Initial commit. Compiles but errors 
Fix up tests

fix commit tests....

Add author param to merge

formatting...

Fix array prob
 2020-12-13 13:13:16 -05:00
VinaiRachakonda
fa57c2f274 Update with fixes 2020-12-13 12:26:45 -05:00
VinaiRachakonda
18d7acdd39 Updates 2020-12-10 14:43:44 -05:00
VinaiRachakonda
592729acdd add error check 2020-12-04 13:01:59 -05:00
Andy Arthur
5f5d6e8c88 reset_hard() => dolt_reset('hard'); 2020-11-10 16:14:42 -08:00
Andy Arthur
632021a255 added reset_hard() sql function 2020-11-10 13:36:01 -08:00
Brian Hendriks
db5b60cc56 parallelism (#841) 2020-08-21 12:22:09 -07:00
Brian Hendriks
6a17aac907 bh/merge-func 2020-06-23 13:57:41 -07:00
Brian Hendriks
ab45d7febf [WIP] Writable Branches (#595) 
* writable dolt_branches table
* hashof func
* commit func
* hashof and commit functions as well as configurable autocommit for server
* revive bats sql server tests + add more
 2020-04-18 09:13:37 -07:00
Brian Hendriks
e3d42d5ee5 Multi DB (#517) 2020-04-09 15:07:52 -07:00
Brian Hendriks
4fc39b5196 Changes to support per connection sql state (#497) 2020-03-30 16:41:27 -07:00
Brian Hendriks
d963b0abc6 dolt sql-server bats test support (#469) 
* renamed files to be consistent across .bats files
* dolt sql-server bats testing

Co-authored-by: Aaron Son <aaron@liquidata.co>
Co-authored-by: Daylon Wilkins <Hydrocharged@users.noreply.github.com>
 2020-03-17 14:06:35 -07:00