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

Merge pull request #5540 from dolthub/JCOR11599-f029801c

Browse Source 
[auto-bump] [no-release-notes] dependency by JCOR11599
This commit is contained in:
Daylon Wilkins
2023-03-09 21:30:32 -08:00
committed by GitHub
parent 051b3c7309 e55442df4d
commit f763350990
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+2 -2
View File
@@ -15,7 +15,7 @@ require (
github.com/dolthub/fslock v0.0.3
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
github.com/dolthub/vitess v0.0.0-20230305090714-6a280b0893da
github.com/dolthub/vitess v0.0.0-20230309010651-308a5f5975ca
github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.13.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -58,7 +58,7 @@ require (
github.com/cenkalti/backoff/v4 v4.1.3
github.com/cespare/xxhash v1.1.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/go-mysql-server v0.14.1-0.20230307172231-6ffcb4eb16e5
github.com/dolthub/go-mysql-server v0.14.1-0.20230309205536-f029801c3ad5
github.com/google/flatbuffers v2.0.6+incompatible
github.com/jmoiron/sqlx v1.3.4
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6
go/go.sum
+4 -4
View File
@@ -166,16 +166,16 @@ github.com/dolthub/flatbuffers v1.13.0-dh.1 h1:OWJdaPep22N52O/0xsUevxJ6Qfw1M2txC
github.com/dolthub/flatbuffers v1.13.0-dh.1/go.mod h1:CorYGaDmXjHz1Z7i50PYXG1Ricn31GcA2wNOTFIQAKE=
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-mysql-server v0.14.1-0.20230307172231-6ffcb4eb16e5 h1:SzePrTa2MDWlYzbEmIrdEkdCY0i63xeuvL3m1MK9lto=
github.com/dolthub/go-mysql-server v0.14.1-0.20230307172231-6ffcb4eb16e5/go.mod h1:6UJk5NlguuhVg/qahl/7+lk4mxJn0NKHCPvBxz978sU=
github.com/dolthub/go-mysql-server v0.14.1-0.20230309205536-f029801c3ad5 h1:N2mkUkaaM7z5c6ru2SgyvQsexDOoSpaC5hnShKv81yk=
github.com/dolthub/go-mysql-server v0.14.1-0.20230309205536-f029801c3ad5/go.mod h1:DoBsD6F/N7+CXZrK3jp8zpKsj0jnMflgmaht98EDFos=
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.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=
github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474/go.mod h1:kMz7uXOXq4qRriCEyZ/LUeTqraLJCjf0WVZcUi6TxUY=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9XGFa6q5Ap4Z/OhNkAMBaK5YeuEzwJt+NZdhiE=
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/vitess v0.0.0-20230305090714-6a280b0893da h1:6Qf0goRG7OfIz6ZAyDhjozWRmhYC51yji+tvkP7gQ7A=
github.com/dolthub/vitess v0.0.0-20230305090714-6a280b0893da/go.mod h1:oVFIBdqMFEkt4Xz2fzFJBNtzKhDEjwdCF0dzde39iKs=
github.com/dolthub/vitess v0.0.0-20230309010651-308a5f5975ca h1:ywfkgI/a1RLzOu1HjjBsZmpYRq97UQF87/ciRxefiY4=
github.com/dolthub/vitess v0.0.0-20230309010651-308a5f5975ca/go.mod h1:oVFIBdqMFEkt4Xz2fzFJBNtzKhDEjwdCF0dzde39iKs=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
go/libraries/doltcore/sqle/enginetest/dolt_queries.go
+3 -3
View File
@@ -142,7 +142,7 @@ var ShowCreateTableAsOfScriptTest = queries.ScriptTest{
" `pk` int NOT NULL,\n" +
" `c2` varchar(20),\n" +
" PRIMARY KEY (`pk`),\n" +
" UNIQUE KEY `c2` (`c2`)\n" +
" UNIQUE KEY `unique_c2` (`c2`)\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin",
},
},
@@ -154,7 +154,7 @@ var ShowCreateTableAsOfScriptTest = queries.ScriptTest{
" `pk` int NOT NULL,\n" +
" `c2` varchar(20),\n" +
" PRIMARY KEY (`pk`),\n" +
" UNIQUE KEY `c2` (`c2`)\n" +
" UNIQUE KEY `unique_c2` (`c2`)\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin",
},
},
@@ -571,7 +571,7 @@ var DoltScripts = []queries.ScriptTest{
" `c` int NOT NULL,\n" +
" `d` varchar(10),\n" +
" PRIMARY KEY (`c`),\n" +
" UNIQUE KEY `d_0` (`d`),\n" +
" UNIQUE KEY `t2du` (`d`),\n" +
" CONSTRAINT `fk1` FOREIGN KEY (`d`) REFERENCES `t1` (`b`)\n" +
") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
},
integration-tests/bats/keyless.bats
+3 -3
View File
@@ -1224,7 +1224,7 @@ SQL
[[ "${lines[0]}" = "count" ]] || false
[[ "${lines[1]}" = "1" ]] || false
run dolt index cat mytable v1v2 -r csv
run dolt index cat mytable ux -r csv
[[ "${lines[0]}" = "v1,v2" ]] || false
[[ "${lines[1]}" = "2,2" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
@@ -1264,7 +1264,7 @@ SQL
[[ "${lines[1]}" = "1,2,2" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt index cat mytable v1 -r csv
run dolt index cat mytable ux -r csv
[[ "${lines[0]}" = "v1" ]] || false
[[ "${lines[1]}" = "2" ]] || false
[[ "${lines[2]}" = "3" ]] || false
@@ -1295,7 +1295,7 @@ SQL
[[ "${lines[1]}" = "1,2,2" ]] || false
[[ "${#lines[@]}" = "2" ]] || false
run dolt index cat mytable v1 -r csv
run dolt index cat mytable ux -r csv
[ $status -eq 0 ]
[[ "${lines[0]}" = "v1" ]] || false
[[ "${lines[1]}" = "2" ]] || false