4
4
"context"
5
5
"database/sql"
6
6
"fmt"
7
- "github.com/davecgh/go-spew/spew"
8
7
"reflect"
9
8
"strings"
10
9
"time"
@@ -268,7 +267,6 @@ func queryWithOptions(ctx context.Context, db *sql.DB, table string, columns []s
268
267
keys = append (keys , fmt .Sprintf ("%s like ?" , k ))
269
268
values = append (values , fmt .Sprintf ("%%%s%%" , v ))
270
269
default :
271
- spew .Dump (v )
272
270
switch v .(type ) {
273
271
case Greater :
274
272
keys = append (keys , fmt .Sprintf ("%s > ?" , k ))
@@ -287,7 +285,6 @@ func queryWithOptions(ctx context.Context, db *sql.DB, table string, columns []s
287
285
}
288
286
} else {
289
287
keys = append (keys , fmt .Sprintf ("%s is null" , k ))
290
- //values = append(values, v)
291
288
}
292
289
}
293
290
if len (keys ) > 0 {
@@ -1024,7 +1021,20 @@ func Count(db *sql.DB, m Model, opts *Options) (count int64, err error) {
1024
1021
query .WriteString (f + " like ?" + divider )
1025
1022
args = append (args , fmt .Sprintf ("%%%s%%" , v ))
1026
1023
default :
1027
- query .WriteString (f + " = ?" + divider )
1024
+ switch v .(type ) {
1025
+ case Greater :
1026
+ query .WriteString (f + " > ?" + divider )
1027
+ case GreaterOrEqual :
1028
+ query .WriteString (f + " >= ?" + divider )
1029
+ case Less :
1030
+ query .WriteString (f + " < ?" + divider )
1031
+ case LessOrEqual :
1032
+ query .WriteString (f + " <= ?" + divider )
1033
+ case NotEqual :
1034
+ query .WriteString (f + " != ?" + divider )
1035
+ default :
1036
+ query .WriteString (f + " = ?" + divider )
1037
+ }
1028
1038
args = append (args , v )
1029
1039
}
1030
1040
} else {
0 commit comments