@@ -16,17 +16,17 @@ var (
1616 errDB = errors .New ("DB error" )
1717)
1818
19- func getDB (t * testing.T ) (* DB , sqlmock.Sqlmock ) {
19+ func getDB (t * testing.T , logLevel int ) (* DB , sqlmock.Sqlmock ) {
2020 mockDB , mock , err := sqlmock .New ()
2121 if err != nil {
2222 t .Fatalf ("an error '%s' was not expected when opening a stub database connection" , err )
2323 }
2424
25- return & DB {mockDB , testutil .NewMockLogger (testutil . INFOLOG )}, mock
25+ return & DB {mockDB , testutil .NewMockLogger (logLevel )}, mock
2626}
2727
2828func TestDB_SelectSingleColumnFromIntToString (t * testing.T ) {
29- db , mock := getDB (t )
29+ db , mock := getDB (t , testutil . INFOLOG )
3030 defer db .DB .Close ()
3131
3232 rows := sqlmock .NewRows ([]string {"id" }).
@@ -42,7 +42,7 @@ func TestDB_SelectSingleColumnFromIntToString(t *testing.T) {
4242}
4343
4444func TestDB_SelectSingleColumnFromStringToString (t * testing.T ) {
45- db , mock := getDB (t )
45+ db , mock := getDB (t , testutil . INFOLOG )
4646 defer db .DB .Close ()
4747
4848 rows := sqlmock .NewRows ([]string {"id" }).
@@ -58,7 +58,7 @@ func TestDB_SelectSingleColumnFromStringToString(t *testing.T) {
5858}
5959
6060func TestDB_SelectSingleColumnFromIntToInt (t * testing.T ) {
61- db , mock := getDB (t )
61+ db , mock := getDB (t , testutil . INFOLOG )
6262 defer db .DB .Close ()
6363
6464 rows := sqlmock .NewRows ([]string {"id" }).
@@ -74,7 +74,7 @@ func TestDB_SelectSingleColumnFromIntToInt(t *testing.T) {
7474}
7575
7676func TestDB_SelectSingleColumnFromIntToCustomInt (t * testing.T ) {
77- db , mock := getDB (t )
77+ db , mock := getDB (t , testutil . INFOLOG )
7878 defer db .DB .Close ()
7979
8080 rows := sqlmock .NewRows ([]string {"id" }).
@@ -93,7 +93,7 @@ func TestDB_SelectSingleColumnFromIntToCustomInt(t *testing.T) {
9393}
9494
9595func TestDB_SelectSingleColumnFromStringToCustomInt (t * testing.T ) {
96- db , mock := getDB (t )
96+ db , mock := getDB (t , testutil . INFOLOG )
9797 defer db .DB .Close ()
9898
9999 rows := sqlmock .NewRows ([]string {"id" }).
@@ -117,9 +117,7 @@ func TestDB_SelectContextError(t *testing.T) {
117117
118118 defer cancel ()
119119
120- t .Setenv ("LOG_LEVEL" , "DEBUG" )
121-
122- db , _ := getDB (t )
120+ db , _ := getDB (t , testutil .DEBUGLOG )
123121 defer db .DB .Close ()
124122
125123 // the query won't run, since context is past deadline and the function will simply return
@@ -128,7 +126,7 @@ func TestDB_SelectContextError(t *testing.T) {
128126
129127func TestDB_SelectDataPointerError (t * testing.T ) {
130128 out := testutil .StderrOutputForFunc (func () {
131- db , _ := getDB (t )
129+ db , _ := getDB (t , testutil . INFOLOG )
132130 defer db .DB .Close ()
133131
134132 db .Select (context .Background (), nil , "select 1" )
@@ -138,7 +136,7 @@ func TestDB_SelectDataPointerError(t *testing.T) {
138136}
139137
140138func TestDB_SelectSingleColumnFromStringToCustomString (t * testing.T ) {
141- db , mock := getDB (t )
139+ db , mock := getDB (t , testutil . INFOLOG )
142140 defer db .DB .Close ()
143141
144142 rows := sqlmock .NewRows ([]string {"id" }).
@@ -157,7 +155,7 @@ func TestDB_SelectSingleColumnFromStringToCustomString(t *testing.T) {
157155}
158156
159157func TestDB_SelectSingleRowMultiColumn (t * testing.T ) {
160- db , mock := getDB (t )
158+ db , mock := getDB (t , testutil . INFOLOG )
161159 defer db .DB .Close ()
162160
163161 rows := sqlmock .NewRows ([]string {"id" , "name" , "image" }).
@@ -183,7 +181,7 @@ func TestDB_SelectSingleRowMultiColumn(t *testing.T) {
183181}
184182
185183func TestDB_SelectSingleRowMultiColumnWithTags (t * testing.T ) {
186- db , mock := getDB (t )
184+ db , mock := getDB (t , testutil . INFOLOG )
187185 defer db .DB .Close ()
188186
189187 rows := sqlmock .NewRows ([]string {"id" , "name" , "image_url" }).
@@ -209,7 +207,7 @@ func TestDB_SelectSingleRowMultiColumnWithTags(t *testing.T) {
209207}
210208
211209func TestDB_SelectMultiRowMultiColumnWithTags (t * testing.T ) {
212- db , mock := getDB (t )
210+ db , mock := getDB (t , testutil . INFOLOG )
213211 defer db .DB .Close ()
214212
215213 rows := sqlmock .NewRows ([]string {"id" , "name" , "image_url" }).
@@ -245,7 +243,7 @@ func TestDB_SelectSingleColumnError(t *testing.T) {
245243 ids := make ([]string , 0 )
246244
247245 out := testutil .StderrOutputForFunc (func () {
248- db , mock := getDB (t )
246+ db , mock := getDB (t , testutil . INFOLOG )
249247 defer db .DB .Close ()
250248
251249 mock .ExpectQuery ("^select id from users" ).
@@ -260,12 +258,10 @@ func TestDB_SelectSingleColumnError(t *testing.T) {
260258}
261259
262260func TestDB_SelectDataPointerNotExpected (t * testing.T ) {
263- t .Setenv ("LOG_LEVEL" , "DEBUG" )
264-
265261 m := make (map [int ]int )
266262
267263 out := testutil .StdoutOutputForFunc (func () {
268- db , _ := getDB (t )
264+ db , _ := getDB (t , testutil . DEBUGLOG )
269265 defer db .DB .Close ()
270266
271267 db .Select (context .Background (), & m , "select id from users" )
0 commit comments