Skip to content

Commit 3018fe7

Browse files
authored
Fix SQLCommenter database/sql test (#221)
* Updated database/sql to use core-0.1.2 * Fix SQLCommenter database/sql test * Ran go mod tidy
1 parent 619477b commit 3018fe7

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

go/database/sql/connection_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestWithComment_NoContext(t *testing.T) {
4141
Config: core.CommenterConfig{EnableDBDriver: true},
4242
},
4343
query: "SELECT 1;",
44-
wantQuery: "SELECT 1/*db_driver=database%2Fsql%3A*/;",
44+
wantQuery: "SELECT 1/*db_driver='database%2Fsql%3A'*/;",
4545
},
4646
{
4747
desc: "enable DBDriver and pass static tag driver name",
@@ -50,7 +50,7 @@ func TestWithComment_NoContext(t *testing.T) {
5050
Tags: core.StaticTags{DriverName: "postgres"},
5151
},
5252
query: "SELECT 1;",
53-
wantQuery: "SELECT 1/*db_driver=database%2Fsql%3Apostgres*/;",
53+
wantQuery: "SELECT 1/*db_driver='database%2Fsql%3Apostgres'*/;",
5454
},
5555
{
5656
desc: "enable DBDriver and pass all static tags",
@@ -59,7 +59,7 @@ func TestWithComment_NoContext(t *testing.T) {
5959
Tags: core.StaticTags{DriverName: "postgres", Application: "app-1"},
6060
},
6161
query: "SELECT 1;",
62-
wantQuery: "SELECT 1/*db_driver=database%2Fsql%3Apostgres*/;",
62+
wantQuery: "SELECT 1/*db_driver='database%2Fsql%3Apostgres'*/;",
6363
},
6464
{
6565
desc: "enable other tags and pass all static tags",
@@ -68,7 +68,7 @@ func TestWithComment_NoContext(t *testing.T) {
6868
Tags: core.StaticTags{DriverName: "postgres", Application: "app-1"},
6969
},
7070
query: "SELECT 1;",
71-
wantQuery: "SELECT 1/*application=app-1,db_driver=database%2Fsql%3Apostgres*/;",
71+
wantQuery: "SELECT 1/*application='app-1',db_driver='database%2Fsql%3Apostgres'*/;",
7272
},
7373
}
7474
for _, tc := range testCases {
@@ -122,7 +122,7 @@ func TestWithComment_WithContext(t *testing.T) {
122122
},
123123
),
124124
query: "SELECT 1;",
125-
wantQuery: "SELECT 1/*application=app-1,db_driver=database%2Fsql%3Apostgres,framework=custom-golang,route=listData*/;",
125+
wantQuery: "SELECT 1/*application='app-1',db_driver='database%2Fsql%3Apostgres',framework='custom-golang',route='listData'*/;",
126126
},
127127
{
128128
desc: "only all options but context contains all tags",
@@ -147,7 +147,7 @@ func TestWithComment_WithContext(t *testing.T) {
147147
},
148148
),
149149
query: "SELECT 1;",
150-
wantQuery: "SELECT 1/*action=any+action,application=app-1,db_driver=database%2Fsql%3Apostgres,framework=custom-golang,route=listData*/;",
150+
wantQuery: "SELECT 1/*action='any+action',application='app-1',db_driver='database%2Fsql%3Apostgres',framework='custom-golang',route='listData'*/;",
151151
},
152152
}
153153
for _, tc := range testCases {

go/database/sql/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/google/sqlcommenter/go/database/sql
22

33
go 1.19
44

5-
require github.com/google/sqlcommenter/go/core v0.1.0
5+
require github.com/google/sqlcommenter/go/core v0.1.2
66

77
require go.opentelemetry.io/otel v1.11.1 // indirect
88

go/database/sql/go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
33
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
44
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
5-
github.com/google/sqlcommenter/go/core v0.0.5-beta h1:axqYR1zQCCdRBLnwr/j+ckllBSBJ7uaVdsnANuGzCUI=
6-
github.com/google/sqlcommenter/go/core v0.0.5-beta/go.mod h1:GORu2htXRC4xtejBzOa4ct1L20pohP81DFNYKdCJI70=
7-
github.com/google/sqlcommenter/go/core v0.1.0 h1:g5jL8HUk2Ko9mMPoCI4jP47dyJhpNyu6E8WmiEhh8OU=
8-
github.com/google/sqlcommenter/go/core v0.1.0/go.mod h1:GORu2htXRC4xtejBzOa4ct1L20pohP81DFNYKdCJI70=
5+
github.com/google/sqlcommenter/go/core v0.1.2 h1:UM3jS7JROrPTsJxbLq68PRB34Iq8H3AZQDQUSV7sQWU=
6+
github.com/google/sqlcommenter/go/core v0.1.2/go.mod h1:GORu2htXRC4xtejBzOa4ct1L20pohP81DFNYKdCJI70=
97
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
108
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
119
go.opentelemetry.io/otel v1.11.1 h1:4WLLAmcfkmDk2ukNXJyq3/kiz/3UzCaYq6PskJsaou4=

0 commit comments

Comments
 (0)