mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-29 03:08:47 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity
8,580 Commits 71 Branches 593 Tags
5c56b8a5dc7143d5ec009896a8dbcfcbec283ac3
Commit Graph

1188 Commits

Author SHA1 Message Date
Vinai Rachakonda
3dcb68ce13 Expose Load data and add a bunch of tests. (#1419) 
This PR exposes LOAD DATA to Dolt. This is a relatively new path to import data into a dolt repo.
 2021-03-09 16:22:01 -05:00
manojcchoudhary
4f5befbb74 Update merge.go 2021-03-06 21:12:27 +05:30
Daylon Wilkins
386d9ef5fd Bump vitess & engine & add Stored Procedure interfaces 2021-03-04 20:31:19 -08:00
Zach Musgrave
4c1c9e2894 Merge pull request #1382 from dolthub/zachmu/yaml-strict 
Turned on strict parsing for the sql server config YAML. This catches…
 2021-03-03 12:02:36 -08:00
Zach Musgrave
a7368f425a Formatting 2021-03-02 20:17:04 -08:00
Zach Musgrave
dace1dda11 Turned on strict parsing for the sql server config YAML. This catches common indentation errors that have confused multiple users. 2021-03-02 20:15:07 -08:00
Zach Musgrave
72adcd3879 Fixed typo in conflicts doc 2021-03-02 19:37:53 -08:00
Andy Arthur
0374c57634 repofmt 2021-02-26 10:01:58 -08:00
Andy Arthur
2fb2e731f9 improve conflict resolution errors 2021-02-26 09:55:12 -08:00
Brian Hendriks
27318fb827 disable foreign key checks on merge with warning (#1369) 2021-02-25 17:04:59 -08:00
Andy Arthur
0e2237c857 fix nil param 2021-02-22 09:07:31 -08:00
Andy Arthur
fd11baaf8c refactor 2021-02-22 08:38:04 -08:00
Andy Arthur
233dacc439 save MergeState.PreMergeWorking during GC 2021-02-22 08:27:12 -08:00
Andy Arthur
2380267ed3 restore pre-merge working set on merge --abort 2021-02-21 19:27:29 -08:00
Andy Arthur
33af2cb987 save active merge commit during GC 2021-02-21 19:22:26 -08:00
Aaron Son
82f2e67c9a Attempt to fix master. 2021-02-19 15:19:39 -08:00
reltuk
69baadf236 [ga-bump-release] update dolt version to 0.23.4 2021-02-19 22:41:41 +00:00
reltuk
5d83677025 [ga-bump-release] update dolt version to 0.23.3 2021-02-19 22:34:39 +00:00
Vinai Rachakonda
79e299fa21 CREATE DATABASE (DBDDL) (#1329) 
This pr adds CREATE DATABASE functionality for SQL.
 2021-02-19 11:29:50 -08:00
AndyA
10751ac22e Merge pull request #1328 from dolthub/andy/write-feature-version 
Andy/write feature version
 2021-02-19 10:54:27 -08:00
AndyA
dd833bd562 Update go/cmd/dolt/commands/version.go 
Co-authored-by: Aaron Son <aaron@dolthub.com>
 2021-02-19 10:21:10 -08:00
Brian Hendriks
db7bae6851 add sql.Context to some of the Close calls (#1347) 2021-02-18 15:31:46 -08:00
Andy Arthur
577a6849d7 merge master to resolve conflicts 2021-02-17 11:55:33 -08:00
Vinai Rachakonda
70a0528b6d Vinai/dolt merge p2 (#1322) 
Adds addition functionality to DOLT_MERGE beyond just ffs
 2021-02-16 20:40:23 -08:00
Andy Arthur
9e40cc45a7 refactored RootValueUnreadable to not swallow errors 2021-02-15 10:32:12 -08:00
AndyA
73c9c0071d Merge pull request #1308 from dolthub/andy/merge-dupe-tables 
Andy/merge dupe tables
 2021-02-12 17:03:45 -08:00
Andy Arthur
84b75961df added bats for feature version 2021-02-12 16:20:02 -08:00
Andy Arthur
8fcb16f587 added --feature-version flag to CLI 2021-02-12 14:54:48 -08:00
Andy Arthur
ccbf87242c write correct RootVal hash on clone 2021-02-12 14:54:48 -08:00
Vinai Rachakonda
6a862db215 Vinai/dolt merge Part 1. Just Fast Forward Merge (#1299) 
This PR adds DOLT_MERGE functionality that only works with FFs.
 2021-02-10 11:19:14 -08:00
Daylon Wilkins
e425ec40b5 Type change tests and bug fixes 2021-02-10 11:06:27 -08:00
Brian Hendriks
96a3fd23a1 disable query diff (#1321) 2021-02-10 10:40:28 -08:00
Daylon Wilkins
7dcc54b630 Check constraints on commit 2021-02-09 01:12:52 -08:00
Andy Arthur
bb3770cd77 remove unused error from schema.SchemasAreEqual 2021-02-08 21:22:47 -08:00
Daylon Wilkins
e7c1a29fc2 Added DELIMITER support to the dolt shell 2021-02-08 00:54:20 -08:00
Vinai Rachakonda
7b53ccb79f Implement SQL dolt_checkout function (#1287) 
This pr adds in DOLT_CHECKOUT functionality for the sql cli.
 2021-02-04 16:16:01 -08:00
Brian Hendriks
09c3c3e4ec Insertion optimizations (#1293) 2021-02-04 14:44:01 -08:00
Zach Musgrave
f6bf6ec93a Merge pull request #1289 from dolthub/zachmu/debuglog-env 
Added DOLT_SQL_DEBUG_LOG and DOLT_SQL_DEBUG_LOG_VERBOSE environment vars
 2021-02-04 09:15:42 -08:00
AndyA
d00a37fbd6 Merge pull request #1278 from dolthub/andy/auto-inc-fix 
Andy/auto inc fix
 2021-02-03 18:04:19 -08:00
Zach Musgrave
e28e856e9c Added env vars for SQL analyzer debug printing 2021-02-03 14:26:06 -08:00
Vinai Rachakonda
68331035e4 Fix bug where batched inserts containing subqueires chose non flushing option.. (#1267) 
This pr fixes a problem where subqueries in insert were not denoted as non batch insert.
 2021-01-29 22:47:57 -05:00
Andy Arthur
b86c8464dd copy AUTO_INCREMENT value on schema change (index/column add/drop/modify) 2021-01-29 16:14:42 -08:00
Brian Hendriks
37d58c1f46 adds ability to redirect stdin from a file (#1264) 2021-01-27 17:55:38 -08:00
Zach Musgrave
f1b2e507b7 Merge master 2021-01-27 09:05:59 -08:00
Zach Musgrave
fc91da34ba Removed unused error params from col_coll.go 2021-01-26 18:24:35 -08:00
Zach Musgrave
2f672c0958 NewColCollection no longer returns an error 2021-01-26 17:44:11 -08:00
Zach Musgrave
70fc8756ae Enforce valid schema in various import jobs 2021-01-26 16:41:37 -08:00
Brian Hendriks
0042732933 fix panic when key does not exist in table (#1233) 2021-01-26 09:11:38 -08:00
Timothy Sehn
647d2787c1 format_repo 2021-01-25 15:44:42 -08:00
Timothy Sehn
5bd7fe8efa Fixed merged go code to make diff --cached work 2021-01-25 15:37:38 -08:00