mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-21 19:39:04 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

[auto-bump] [no-release-notes] dependency by JCOR11599 (#6032)

Browse Source
This commit is contained in:
Dustin Brown
2023-05-25 14:08:53 -07:00
committed by GitHub
parent 2f64900058
commit 0207e5c600
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+2 -2
View File
@@ -59,7 +59,7 @@ require (
github.com/cespare/xxhash v1.1.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.15.1-0.20230525061005-0a2245f0476d
github.com/dolthub/go-mysql-server v0.15.1-0.20230525184626-7bc3907efa56
github.com/dolthub/swiss v0.1.0
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/golang-lru/v2 v2.0.2
@@ -97,7 +97,7 @@ require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e // indirect
github.com/dolthub/jsonpath v0.0.1 // indirect
github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 // indirect
github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577 // indirect
github.com/go-fonts/liberation v0.2.0 // indirect
github.com/go-kit/kit v0.10.0 // indirect
go/go.sum
+4 -4
View File
@@ -168,12 +168,12 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
github.com/dolthub/go-mysql-server v0.15.1-0.20230525061005-0a2245f0476d h1:UD3pfkn+0kLpFNdeo/uEl3x72TQjNqC8DB/KvnjMZqw=
github.com/dolthub/go-mysql-server v0.15.1-0.20230525061005-0a2245f0476d/go.mod h1:Mf2jCPvtE9GzjWaVfPpOBCWCLtw6Up21xkrKDW8H/aM=
github.com/dolthub/go-mysql-server v0.15.1-0.20230525184626-7bc3907efa56 h1:blDcgBsG0N6l/AitbFLUrZs0N3OguaARK7ekV7+dpMA=
github.com/dolthub/go-mysql-server v0.15.1-0.20230525184626-7bc3907efa56/go.mod h1:ceIq7Ddw+y4Pddk1+AqYYYURTC7DEMk331dEwyJhKj0=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
github.com/dolthub/jsonpath v0.0.1 h1:Nd+T3U+XisK3kOuxtABS5IIbZqXVIlOR9VYquyjQ0u0=
github.com/dolthub/jsonpath v0.0.1/go.mod h1:ZWUdY4iszqRQ8OcoXClkxiAVAoWoK3cq0Hvv4ddGRuM=
github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ=
github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72/go.mod h1:ZWUdY4iszqRQ8OcoXClkxiAVAoWoK3cq0Hvv4ddGRuM=
github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577 h1:SegEguMxToBn045KRHLIUlF2/jR7Y2qD6fF+3tdOfvI=
github.com/dolthub/maphash v0.0.0-20221220182448-74e1e1ea1577/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
integration-tests/bats/import-append-tables.bats
-4
View File
@@ -11,7 +11,6 @@ teardown() {
}
@test "import-append-tables: disallow overwriting row during append" {
skip_nbf_not_dolt
dolt sql -q "CREATE TABLE t (pk int primary key, col1 int);"
dolt table import -a t <<CSV
pk, col1
@@ -35,7 +34,6 @@ CSV
}
@test "import-append-tables: disallow multiple keys with different values during append" {
skip_nbf_not_dolt
dolt sql -q "CREATE TABLE t (pk int primary key, col1 int);"
run dolt table import -a t <<CSV
pk, col1
@@ -56,7 +54,6 @@ CSV
}
@test "import-append-tables: ignore rows that would have no effect on import" {
skip_nbf_not_dolt
dolt sql -q "CREATE TABLE t (pk int primary key, col1 int);"
dolt table import -a t <<CSV
pk, col1
@@ -82,7 +79,6 @@ CSV
}
@test "import-append-tables: reject rows in source that would modify rows in destination, but continue if --continue is supplied" {
skip_nbf_not_dolt
dolt sql -q "CREATE TABLE t (pk int primary key, col1 int);"
dolt table import -a t <<CSV
pk, col1