#1696 fix by darkmmon · Pull Request #1702 · SeaQL/sea-orm

darkmmon · 2023-06-12T09:20:54Z

PR Info

Closes Select any SimpleExpr via QuerySelect #1696

New Features

expr() and exprs() for QuerySelect trait

Changes

typo fix in docker-create.sh

tyt2y3 · 2023-06-12T15:08:57Z

Is it ready to review?

darkmmon · 2023-06-12T15:30:40Z

Yes. I added the functions and appropriate doc test already.

src/query/helper.rs

tyt2y3 · 2023-06-12T22:49:40Z

Next time please make a better PR title

src/query/helper.rs

Co-authored-by: Chris Tsang <[email protected]>

billy1624

Hey @darkmmon, good first PR!

Take below for example, my imaginated real life example

use sea_orm::sea_query::Expr;
use sea_orm::{entity::*, tests_cfg::cake, DbBackend, QuerySelect, QueryTrait};

assert_eq!(
    cake::Entity::find()
        .select_only()
        .expr(Expr::col((cake::Entity, cake::Column::Id)))
        .expr(Expr::col((cake::Entity, cake::Column::Name)))
        .build(DbBackend::MySql)
        .to_string(),
    "SELECT `cake`.`id`, `cake`.`name` FROM `cake`"
);

use sea_orm::sea_query::Expr;
use sea_orm::{entity::*, tests_cfg::cake, DbBackend, QuerySelect, QueryTrait};

assert_eq!(
    cake::Entity::find()
        .select_only()
        .exprs([
            Expr::col((cake::Entity, cake::Column::Id)),
            Expr::col((cake::Entity, cake::Column::Name)),
        ])
        .build(DbBackend::MySql)
        .to_string(),
    "SELECT `cake`.`id`, `cake`.`name` FROM `cake`"
);

Note that I import sea_orm::sea_query::Expr instead of sea_query::Expr. Because the end user does not necessary depends on sea_query but it must depends on sea_orm. So, we better direct user to import the sea_query symbols re-exported by sea_orm. Hope that make sense :)

Co-authored-by: Chris Tsang <[email protected]>

…fix

billy1624

A feature creep: I think we can add expr_as as well
https://docs.rs/sea-query/latest/sea_query/query/struct.SelectStatement.html#method.expr_as

use sea_orm::sea_query::{Expr, Func};
use sea_orm::{entity::*, tests_cfg::cake, DbBackend, QuerySelect, QueryTrait};

assert_eq!(
    cake::Entity::find()
        .expr_as(Func::upper(Expr::col((cake::Entity, cake::Column::Name))), "name_upper")
        .build(DbBackend::MySql)
        .to_string(),
    "SELECT `cake`.`id`, `cake`.`name`, UPPER(`cake`.`name`) AS `name_upper` FROM `cake`"
);

With a real life example. Copy and paste is okay. But feel free to add your own style :)

darkmmon · 2023-06-13T03:47:21Z

Thanks @billy1624 and @tyt2y3 for all the suggestions! I integrated them to the code.

billy1624 · 2023-06-13T04:12:02Z

src/query/helper.rs

+    fn expr_as<T, A>(&mut self, expr: T, alias: A) -> &mut Self
+    where
+        T: Into<SimpleExpr>,
+        A: IntoIden,
+    {
+        self.query().expr_as(expr, alias);
+        self
+    }


One final change, we may well align it with QuerySelect::column_as method and take an alias of I: IntoIdentity

Hint: better update the example to supply an &str as the alias

billy1624 · 2023-06-13T04:12:49Z

src/query/helper.rs

+    fn expr_as<T, A>(&mut self, expr: T, alias: A) -> &mut Self
+    where
+        T: Into<SimpleExpr>,
+        A: IntoIden,
+    {
+        self.query().expr_as(expr, alias);
+        self
+    }


Hint: better update the example to supply an &str as the alias

billy1624

well done!

* Optional Field SeaQL/sea-orm#1513 * .gitignore SeaQL/sea-orm#1334 * migration table custom name SeaQL/sea-orm#1511 * OR condition relation SeaQL/sea-orm#1433 * DerivePartialModel SeaQL/sea-orm#1597 * space for migration file naming SeaQL/sea-orm#1570 * composite key up to 12 SeaQL/sea-orm#1508 * seaography integration SeaQL/sea-orm#1599 * QuerySelect SimpleExpr SeaQL/sea-orm#1702 * sqlErr SeaQL/sea-orm#1707 * migration check SeaQL/sea-orm#1519 * postgres array SeaQL/sea-orm#1565 * param intoString SeaQL/sea-orm#1439 * **skipped** re-export SeaQL/sea-orm#1661 * ping SeaQL/sea-orm#1627 * on empty do nothing SeaQL/sea-orm#1708 * on conflict do nothing SeaQL/sea-orm#1712 * **skipped** upgrade versions * active enum fail safe SeaQL/sea-orm#1374 * relation generation check SeaQL/sea-orm#1435 * entity generation bug SeaQL/sea-schema#105 * **skipped** bug fix that does not require edits * EnumIter change SeaQL/sea-orm#1535 * completed and fixed a previous todo SeaQL/sea-orm#1570 * amended wordings and structures * Edit * Remove temp file --------- Co-authored-by: Billy Chan <[email protected]>

github-actions · 2023-08-02T17:12:23Z

🎉 Released In 0.12.1 🎉

Thank you everyone for the contribution!
This feature is now available in the latest release. Now is a good time to upgrade!
Your participation is what makes us unique; your adoption is what drives us forward.
You can support SeaQL 🌊 by starring our repos, sharing our libraries and becoming a sponsor ⭐.

billy1624 and others added 5 commits June 12, 2023 17:02

Test suit load environment variable from env files

7b5cce4

Added expr() and exprs() for QuerySelect trait and Minor typo fix

0215d8d

Merge remote-tracking branch 'sea-orm/master' into SeaQL#1696-fix

8c3dfad

fmt

bd93088

Added doc testing for the new functions

fa3c75a

tyt2y3 reviewed Jun 12, 2023

View reviewed changes

src/query/helper.rs Outdated Show resolved Hide resolved

tyt2y3 reviewed Jun 12, 2023

View reviewed changes

src/query/helper.rs Outdated Show resolved Hide resolved

Remove excess comment for doc test

c45475f

Co-authored-by: Chris Tsang <[email protected]>

billy1624 reviewed Jun 13, 2023

View reviewed changes

darkmmon and others added 3 commits June 13, 2023 10:32

Remove excess comment for doc test

3c000f8

Co-authored-by: Chris Tsang <[email protected]>

updated doc tests to make example more realistic

d0acc86

Merge remote-tracking branch 'darkmmon/SeaQL#1696-fix' into SeaQL#1696-…

4272ad5

…fix

billy1624 reviewed Jun 13, 2023

View reviewed changes

changed doc test again for more realistic query and added expr_as()

8e6d2d9

billy1624 reviewed Jun 13, 2023

View reviewed changes

darkmmon added 2 commits June 13, 2023 12:24

aligned expr_as() alias input with column_as() input

5e02231

update doc test for expr_as() according to previous changes

db06b62

billy1624 approved these changes Jun 13, 2023

View reviewed changes

tyt2y3 approved these changes Jun 13, 2023

View reviewed changes

billy1624 assigned darkmmon Jun 13, 2023

billy1624 merged commit 0816faa into SeaQL:master Jun 13, 2023

billy1624 mentioned this pull request Jun 19, 2023

Select any SimpleExpr via QuerySelect #1696

Closed

darkmmon added a commit to darkmmon/seaql.github.io that referenced this pull request Jul 12, 2023

QuerySelect SimpleExpr SeaQL/sea-orm#1702

74e68f4

Uh oh!

Conversation

darkmmon commented Jun 12, 2023

PR Info

New Features

Changes

Uh oh!

tyt2y3 commented Jun 12, 2023

Uh oh!

darkmmon commented Jun 12, 2023

Uh oh!

Uh oh!

tyt2y3 commented Jun 12, 2023

Uh oh!

Uh oh!

billy1624 left a comment

Choose a reason for hiding this comment

Uh oh!

billy1624 left a comment

Choose a reason for hiding this comment

Uh oh!

darkmmon commented Jun 13, 2023

Uh oh!

billy1624 Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

billy1624 Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

darkmmon Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

billy1624 Jun 13, 2023

Choose a reason for hiding this comment

Uh oh!

billy1624 left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 2, 2023

🎉 Released In 0.12.1 🎉

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants