mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-27 18:59:23 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

Merge branch 'main' into james/users

Browse Source
This commit is contained in:
James Cor
2022-07-28 13:04:46 -07:00
parent 0326d12f72 410416cb35
commit 32df4d8029
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/go.mod
View File

@@ -58,7 +58,7 @@ require (
)
require (
github.com/dolthub/go-mysql-server v0.12.1-0.20220728003136-67f7641f1275
github.com/dolthub/go-mysql-server v0.12.1-0.20220728170427-82a31eff75d6
github.com/google/flatbuffers v2.0.6+incompatible
github.com/gosuri/uilive v0.0.4
github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6

4
go/go.sum
View File

@@ -173,8 +173,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
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.12.1-0.20220728003136-67f7641f1275 h1:l/k2ms9Ut/HCuRmT8qgsp6IC5ne1ojZWO1xFrIOvsOs=
github.com/dolthub/go-mysql-server v0.12.1-0.20220728003136-67f7641f1275/go.mod h1:JgB3WpY0RMgyAda3YG5VHVncH2B8i1N9Mx9LOp41lIs=
github.com/dolthub/go-mysql-server v0.12.1-0.20220728170427-82a31eff75d6 h1:txQTQU3kexgjfEFM4nVoBuFWkoAtFML78CTPJA5jrnE=
github.com/dolthub/go-mysql-server v0.12.1-0.20220728170427-82a31eff75d6/go.mod h1:JgB3WpY0RMgyAda3YG5VHVncH2B8i1N9Mx9LOp41lIs=
github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371 h1:oyPHJlzumKta1vnOQqUnfdz+pk3EmnHS3Nd0cCT0I2g=
github.com/dolthub/ishell v0.0.0-20220112232610-14e753f0f371/go.mod h1:dhGBqcCEfK5kuFmeO5+WOx3hqc1k3M29c1oS/R7N4ms=
github.com/dolthub/jsonpath v0.0.0-20210609232853-d49537a30474 h1:xTrR+l5l+1Lfq0NvhiEsctylXinUMFhhsqaEcl414p8=

17
go/utils/repofmt/check_prepared_tests.sh Executable file
View File

@@ -0,0 +1,17 @@
#!/bin/bash
#set -eo pipefail
script_dir=$(dirname "$0")
cd $script_dir/../..
all_cnt=$(grep "func Test.*" libraries/doltcore/sqle/enginetest/dolt_engine_test.go | wc -l | tr -dc '0-9')
prep_cnt=$(grep "func Test.*Prepared" libraries/doltcore/sqle/enginetest/dolt_engine_test.go | wc -l | tr -dc '0-9')
skip_cnt=$(grep "SkipPreparedsCount" libraries/doltcore/sqle/enginetest/dolt_engine_test.go | awk '{print $4}' | tr -dc '0-9')
expected="$((all_cnt-skip_cnt))"
if [[ "$expected" != "$prep_cnt" ]]; then
echo "Expected '$expected' TestPrepared enginetests in dolt_engine_test.go, found: '$prep_cnt'"
echo "Either increment SkipPreparedsCount or add a prepared test for the new test suite"
fi