Fix related & linked with enum columns

[billy1624]

PR Info

• Resolve find_with_related panic #374

[billy1624]

Hey @MorganNesbitt, can you try this PR?

You can update your toml

sea-orm = { git = "https://github.com/SeaQL/sea-orm.git", branch = "issues/374", ... }

[tyt2y3]

Can briefly explain what's the root cause?

[MorganNesbitt]

hi @billy1624 that fixed the panic!

One thing I did notice now that I have a join working, is that it adds an order by id no matter what. which seemed odd, and when you add an order to the query it doesn't replace it just puts it right after.

A normal single query doesn't add an order, but the join does.

is this expected?

Below is what's being generated when I do a find_with_related but provide no order_by myself.
This is part of the debug that's being printed when I run the query

...
FROM
      "customer_employee_record"
      LEFT JOIN "historical_customer_employee_record" ON "customer_employee_record"."id" = "historical_customer_employee_record"."customerEmployeeRecordId"
    WHERE
      "customer_employee_record"."companyId" = $1
    ORDER BY
      "customer_employee_record"."id" ASC

[billy1624]

It panic at this line. It didn't catch ColumnRef::AsEnum and apply alias for it.

[billy1624]

@tyt2y3

[billy1624]

And I caught some other bug as well. This should pass the TableRef in directly, so that schema name will also be included if needed.

[billy1624]

And I caught some other bug as well. This should pass the TableRef in directly, so that schema name will also be included if needed.

Same here

[billy1624]

hi @billy1624 that fixed the panic!

One thing I did notice now that I have a join working, is that it adds an order by id no matter what. which seemed odd, and when you add an order to the query it doesn't replace it just puts it right after.

A normal single query doesn't add an order, but the join does.

is this expected?

Below is what's being generated when I do a find_with_related but provide no order_by myself. This is part of the debug that's being printed when I run the query

...
FROM
      "customer_employee_record"
      LEFT JOIN "historical_customer_employee_record" ON "customer_employee_record"."id" = "historical_customer_employee_record"."customerEmployeeRecordId"
    WHERE
      "customer_employee_record"."companyId" = $1
    ORDER BY
      "customer_employee_record"."id" ASC

That additional order by is intended. If you look into the implementation of SelectTwoMany, you will notice that it consolidate single dimension query rows into nested result, Vec<(E::Model, Vec<F::Model>)>. Hence, the relative order of E::Model result and its related F::Model result is important.

sea-orm/src/executor/select.rs

Lines 751 to 785 in 18ed683

	fn consolidate_query_result<L, R>(
	rows: Vec<(L::Model, Option<R::Model>)>,
	) -> Vec<(L::Model, Vec<R::Model>)>
	where
	L: EntityTrait,
	R: EntityTrait,
	{
	let mut acc: Vec<(L::Model, Vec<R::Model>)> = Vec::new();
	for (l, r) in rows {
	if let Some((last_l, last_r)) = acc.last_mut() {
	let mut same_l = true;
	for pk_col in <L::PrimaryKey as Iterable>::iter() {
	let col = pk_col.into_column();
	let val = l.get(col);
	let last_val = last_l.get(col);
	if !val.eq(&last_val) {
	same_l = false;
	break;
	}
	}
	if same_l {
	if let Some(r) = r {
	last_r.push(r);
	continue;
	}
	}
	}
	if r.is_some() {
	acc.push((l, vec![r.unwrap()]));
	} else {
	acc.push((l, vec![]));
	}
	}
	acc
	}

(My explanation might be confusing loll)

[tyt2y3]

Great thanks