Skip to content

Commit 15d6735

Browse files
tietie
authored
Merge branch 'master' into handle-errors
2 parents fdd3a74 + c599bfb commit 15d6735

8 files changed

Lines changed: 101 additions & 77 deletions

File tree

‎tests/mssql/go.mod‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/go-logr/logr v1.4.3 // indirect
4646
github.com/go-logr/stdr v1.2.2 // indirect
4747
github.com/go-ole/go-ole v1.3.0 // indirect
48-
github.com/godogx/clocksteps v0.4.0 // indirect
48+
github.com/godogx/clocksteps v0.5.0 // indirect
4949
github.com/godogx/dbsteps v0.1.3 // indirect
5050
github.com/godogx/resource v0.1.1 // indirect
5151
github.com/gofrs/uuid v4.4.0+incompatible // indirect
@@ -55,6 +55,7 @@ require (
5555
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
5656
github.com/golang-sql/sqlexp v0.1.0 // indirect
5757
github.com/google/uuid v1.6.0 // indirect
58+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5859
github.com/hashicorp/errwrap v1.1.0 // indirect
5960
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
6061
github.com/hashicorp/go-memdb v1.3.5 // indirect
@@ -82,14 +83,14 @@ require (
8283
github.com/pkg/errors v0.9.1 // indirect
8384
github.com/pmezard/go-difflib v1.0.0 // indirect
8485
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
85-
github.com/prometheus/client_golang v1.23.0 // indirect
86+
github.com/prometheus/client_golang v1.23.1 // indirect
8687
github.com/prometheus/client_model v0.6.2 // indirect
87-
github.com/prometheus/common v0.65.0 // indirect
88+
github.com/prometheus/common v0.66.0 // indirect
8889
github.com/prometheus/procfs v0.16.1 // indirect
8990
github.com/sergi/go-diff v1.4.0 // indirect
9091
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
9192
github.com/sirupsen/logrus v1.9.3 // indirect
92-
github.com/spf13/pflag v1.0.7 // indirect
93+
github.com/spf13/pflag v1.0.10 // indirect
9394
github.com/stretchr/testify v1.11.1 // indirect
9495
github.com/swaggest/assertjson v1.9.0 // indirect
9596
github.com/swaggest/form/v5 v5.1.1 // indirect
@@ -113,9 +114,10 @@ require (
113114
go.uber.org/atomic v1.11.0 // indirect
114115
golang.org/x/crypto v0.39.0 // indirect
115116
golang.org/x/sys v0.35.0 // indirect
116-
golang.org/x/text v0.26.0 // indirect
117+
golang.org/x/text v0.28.0 // indirect
117118
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
118-
google.golang.org/protobuf v1.36.6 // indirect
119+
google.golang.org/protobuf v1.36.8 // indirect
120+
gopkg.in/yaml.v2 v2.4.0 // indirect
119121
gopkg.in/yaml.v3 v3.0.1 // indirect
120122
)
121123

‎tests/mssql/go.sum‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
100100
github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
101101
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
102102
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
103-
github.com/godogx/clocksteps v0.4.0 h1:vYyTph5tBi0dO0QTGSZUB2cYiih5SCZIXJ0RJjUxHYg=
104-
github.com/godogx/clocksteps v0.4.0/go.mod h1:LY6LrxLlnOBH/BTBGzGP9WbMtDiu6v8afDJL0UvuKHo=
103+
github.com/godogx/clocksteps v0.5.0 h1:DKGcqVSDNammS7p2gZPHYmX4nuM1rAlektumRy2fN4k=
104+
github.com/godogx/clocksteps v0.5.0/go.mod h1:+7PPwekpra3jNtnm/bjWYajVoh+IPRspBbafwf6CdEQ=
105105
github.com/godogx/dbsteps v0.1.3 h1:rno+ArRmreckJE58JW8pNBupepcWXQQp9TtDV0s8PqE=
106106
github.com/godogx/dbsteps v0.1.3/go.mod h1:5GK1OK0nFqKUEoAn0lKbhXSZLGs9qnMJhAaO3WsCbW8=
107107
github.com/godogx/resource v0.1.1 h1:1vbznIn1mUCP+9TzJp9v8QKm54kAMTe38CBLnFBk0j8=
@@ -127,6 +127,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
127127
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
128128
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
129129
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
130+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
131+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
130132
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys=
131133
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
132134
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -223,12 +225,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
223225
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
224226
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
225227
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
226-
github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
227-
github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
228+
github.com/prometheus/client_golang v1.23.1 h1:w6gXMLQGgd0jXXlote9lRHMe0nG01EbnJT+C0EJru2Y=
229+
github.com/prometheus/client_golang v1.23.1/go.mod h1:br8j//v2eg2K5Vvna5klK8Ku5pcU5r4ll73v6ik5dIQ=
228230
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
229231
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
230-
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
231-
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
232+
github.com/prometheus/common v0.66.0 h1:K/rJPHrG3+AoQs50r2+0t7zMnMzek2Vbv31OFVsMeVY=
233+
github.com/prometheus/common v0.66.0/go.mod h1:Ux6NtV1B4LatamKE63tJBntoxD++xmtI/lK0VtEplN4=
232234
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
233235
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
234236
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
@@ -242,8 +244,9 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
242244
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
243245
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
244246
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
245-
github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
246247
github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
248+
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
249+
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
247250
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
248251
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
249252
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -340,8 +343,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
340343
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
341344
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
342345
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
343-
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
344-
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
346+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
347+
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
345348
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
346349
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
347350
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -377,8 +380,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
377380
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
378381
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
379382
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
380-
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
381-
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
383+
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
384+
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
382385
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
383386
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
384387
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -398,15 +401,16 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:
398401
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
399402
google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
400403
google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
401-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
402-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
404+
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
405+
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
403406
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
404407
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
405408
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
406409
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
407410
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
408411
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
409412
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
413+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
410414
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
411415
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
412416
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎tests/mysql/go.mod‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ require (
4242
github.com/go-logr/logr v1.4.3 // indirect
4343
github.com/go-logr/stdr v1.2.2 // indirect
4444
github.com/go-ole/go-ole v1.3.0 // indirect
45-
github.com/godogx/clocksteps v0.4.0 // indirect
45+
github.com/godogx/clocksteps v0.5.0 // indirect
4646
github.com/godogx/dbsteps v0.1.3 // indirect
4747
github.com/godogx/resource v0.1.1 // indirect
4848
github.com/gofrs/uuid v4.4.0+incompatible // indirect
4949
github.com/gogo/protobuf v1.3.2 // indirect
5050
github.com/golang-migrate/migrate/v4 v4.18.1 // indirect
5151
github.com/google/uuid v1.6.0 // indirect
52+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
5253
github.com/hashicorp/errwrap v1.1.0 // indirect
5354
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
5455
github.com/hashicorp/go-memdb v1.3.5 // indirect
@@ -75,14 +76,14 @@ require (
7576
github.com/pkg/errors v0.9.1 // indirect
7677
github.com/pmezard/go-difflib v1.0.0 // indirect
7778
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
78-
github.com/prometheus/client_golang v1.23.0 // indirect
79+
github.com/prometheus/client_golang v1.23.1 // indirect
7980
github.com/prometheus/client_model v0.6.2 // indirect
80-
github.com/prometheus/common v0.65.0 // indirect
81+
github.com/prometheus/common v0.66.0 // indirect
8182
github.com/prometheus/procfs v0.16.1 // indirect
8283
github.com/sergi/go-diff v1.4.0 // indirect
8384
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
8485
github.com/sirupsen/logrus v1.9.3 // indirect
85-
github.com/spf13/pflag v1.0.7 // indirect
86+
github.com/spf13/pflag v1.0.10 // indirect
8687
github.com/stretchr/testify v1.11.1 // indirect
8788
github.com/swaggest/assertjson v1.9.0 // indirect
8889
github.com/swaggest/form/v5 v5.1.1 // indirect
@@ -107,7 +108,8 @@ require (
107108
golang.org/x/crypto v0.39.0 // indirect
108109
golang.org/x/sys v0.35.0 // indirect
109110
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
110-
google.golang.org/protobuf v1.36.6 // indirect
111+
google.golang.org/protobuf v1.36.8 // indirect
112+
gopkg.in/yaml.v2 v2.4.0 // indirect
111113
gopkg.in/yaml.v3 v3.0.1 // indirect
112114
)
113115

0 commit comments

Comments
 (0)