Merge pull request #48 from davidjumani/add-orderby-for-all

Adding OrderBy methods for all data types
jirfag · Aug 1, 2019 · 9132023 · 9132023
2 parents 10c5399 + 2eb8cbd
commit 9132023
Show file tree

Hide file tree

Showing 5 changed files with 210 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -266,14 +266,19 @@ func NewUserQuerySet(db *gorm.DB) UserQuerySet
 		func (qs UserQuerySet) NameIn(name string, nameRest ...string) UserQuerySet {}
 		func (qs UserQuerySet) NameNotIn(name string, nameRest ...string) UserQuerySet {}
 		```
+		* `Order(Asc|Desc)By{FieldName}()`
+		```go
+		func (qs UserQuerySet) OrderDescByRating() UserQuerySet
+		```
 	* numeric types (`int`, `int64`, `uint` etc + `time.Time`):
  		* `{FieldName}(Lt|Lte|Gt|Gte)(arg {FieldType)`
 		```go
 		func (qs UserQuerySet) RatingGt(rating int) UserQuerySet
 		```
-		* `Order(Asc|Desc)By{FieldName}()`
+	* string types (`string`):
+ 		* `{FieldName}(Like/Notlike)(arg {FieldType)`
 		```go
-		func (qs UserQuerySet) OrderDescByRating() UserQuerySet
+		func (qs UserQuerySet) NameLike(name string) UserQuerySet
 		```
 	* pointer fields: `{FieldName}IsNull()`, `{FieldName}IsNotNull()`
 	```go

diff --git a/examples/comparison/gorm4/autogenerated_gorm4.go b/examples/comparison/gorm4/autogenerated_gorm4.go
diff --git a/internal/queryset/generator/methodsbuilder.go b/internal/queryset/generator/methodsbuilder.go
@@ -30,6 +30,8 @@ func (b *methodsBuilder) getQuerySetMethodsForField(f field.Info) []methods.Meth
 	basicTypeMethods := []methods.Method{
 		methods.NewBinaryFilterMethod(fctx.WithOperationName("eq")),
 		methods.NewBinaryFilterMethod(fctx.WithOperationName("ne")),
+		methods.NewOrderAscByMethod(fctx),
+		methods.NewOrderDescByMethod(fctx),
 	}
 
 	if !f.IsTime {
@@ -49,8 +51,6 @@ func (b *methodsBuilder) getQuerySetMethodsForField(f field.Info) []methods.Meth
 		methods.NewBinaryFilterMethod(fctx.WithOperationName("gt")),
 		methods.NewBinaryFilterMethod(fctx.WithOperationName("lte")),
 		methods.NewBinaryFilterMethod(fctx.WithOperationName("gte")),
-		methods.NewOrderAscByMethod(fctx),
-		methods.NewOrderDescByMethod(fctx),
 	}
 
 	if f.IsNumeric {

diff --git a/internal/queryset/generator/test/autogenerated_models.go b/internal/queryset/generator/test/autogenerated_models.go