Skip to content

Commit c7f81fe

Browse files
committed
fix bugs
1 parent 8eb4d1f commit c7f81fe

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

orm/err.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var (
1111
ErrRawSqlRequired = errors.New("raw sql required")
1212
ErrParamMustBePtr = errors.New("param must be ptr")
1313
ErrParamElemKindMustBeStruct = errors.New("param elem kind must be struct")
14-
ErrColumnShouldBeStringOrPtr = errors.New("select|where column should be string or ptr of struct field")
14+
ErrColumnShouldBeStringOrPtr = errors.New("select|where column should be string or ptr of Table.T.field")
1515
ErrDestOfGetToMustBePtr = errors.New("dest of Get-to must be ptr")
1616
ErrDestOfGetToSliceElemMustNotBePtr = errors.New("dest of Get-to slice elem kind must not be ptr")
1717
)

orm/query.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@ func (m Query[T]) parseColumn(v interface{}) (string, error) {
223223
prefix += "."
224224
}
225225
return prefix + ret, nil
226+
} else if ret == "" {
227+
return "", ErrColumnShouldBeStringOrPtr
226228
} else {
227229
return ret, nil
228230
}

orm/query_where.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ func (m Query[T]) where(isOr bool, column interface{}, vals ...interface{}) Quer
3535
if ok == false {
3636
return m.setErr(errors.New("where-param should be string while only 1 param exist"))
3737
}
38-
m.wheres = append(m.wheres, where{Raw: c, IsOr: isOr})
38+
if c != "" {
39+
m.wheres = append(m.wheres, where{Raw: c, IsOr: isOr})
40+
} else {
41+
return m.setErr(errors.New("where-param should not be empty string"))
42+
}
3943
} else {
4044
c, err := m.parseColumn(column)
4145
if err != nil {

0 commit comments

Comments
 (0)