Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(database/gdb): invalid order by statement generated when multiple order inputs #3803

Merged
merged 4 commits into from
Sep 28, 2024

Conversation

LanceAdd
Copy link
Contributor

dao.User.Ctx(ctx).Offset(10).Limit(1).Order("age asc", "name desc")

Bad SQL is generated

SELECT `id`, `name`, `age`
FROM `user`
ORDER BY `id` asc name desc
LIMIT 1 OFFSET 10

Generate the correct SQL statement

SELECT `id`, `name`, `age`
FROM `user`
ORDER BY `id` asc, `name` desc
LIMIT 1 OFFSET 10

@gqcn
Copy link
Member

gqcn commented Sep 25, 2024

@LanceAdd Would you please add associated unit testing case for this update?

@gqcn gqcn changed the title fix(database/gdb): fix Order generate sql error fix(database/gdb): invalid order by statement generated when multiple order inputs Sep 25, 2024
@LanceAdd
Copy link
Contributor Author

@LanceAdd Would you please add associated unit testing case for this update?

Of course, but in which unit test file should I add this unit test

contrib/drivers/mysql/mysql_z_unit_model_test.go Outdated Show resolved Hide resolved
contrib/drivers/mysql/mysql_z_unit_model_test.go Outdated Show resolved Hide resolved
@gqcn
Copy link
Member

gqcn commented Sep 25, 2024

@LanceAdd hello, please resolve the conflicts before merging.

# Conflicts:
#	contrib/drivers/mysql/mysql_z_unit_model_test.go
@LanceAdd LanceAdd reopened this Sep 27, 2024
@gqcn gqcn merged commit 66ee52c into gogf:master Sep 28, 2024
34 checks passed
houseme added a commit that referenced this pull request Sep 28, 2024
…ris-config

* 'master' of github.com:gogf/gf: (23 commits)
  build(go.mod): upgrade minimum required go version from 1.18 to 1.20 (#3688)
  refactor(net/ghttp): enhance `ghttp.StartPProfServer` (#3555)
  refactor(encoding/gjson): change data parameter from type any to []byte (#3542)
  refactor(net/gudp): improve implements (#3491)
  fix(os/gcache): memory leak for LRU when adding operations more faster than deleting (#3823)
  fix(os/gcmd): argument index calculating error in multilevel command (#3807)
  fix(database/gdb): invalid order by statement generated when multiple order inputs (#3803)
  fix(cmd/gf): creating logic.go empty folder when there is no correct logic service (#3815)
  test(drivers/mysql): loose unit testing for transaction (#3819)
  fix(net/ghttp&gclient,contrib/rpc/grpcx): remove request and response contents in opentelemetry tracing attributes (#3810)
  feat: new version v2.7.4 (#3809)
  fix(util/gconv): unstable converting when there is an external attribute with the same name as the internal structure (#3799)
  feat(database/gdb): add year field type support for ORM operations (#3805)
  fix(cmd/gf): table and field names converted to its lower case before CamelCase converting in command `gen dao` (#3801)
  fix(net/gclient): panic when containing `@file:` parameter value in json post request (#3775)
  feat(contrib/registry/etcd/): add `DialTimeout` and `AutoSyncInterval` option (#3698)
  fix(database/gdb): support OrderRandom feature in different databases (#3794)
  fix(net/goai): change default value of RequestBody.Required from true to false, add required tag support for RequestBody (#3796)
  fix(util/gvalid): retrive empty slice parameter in custom validation rule function failed (#3795)
  fix(util/gconv): cached field indexes append issue caused incorrect field converting (#3790)
  ...

# Conflicts:
#	.github/workflows/ci-main.sh
#	.github/workflows/golangci-lint.yml
#	contrib/metric/otelmetric/go.mod
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants