Formatting for MySQL UPDATE statement

The default formatting rule for UPDATE statements in MySQL is:

	Code:
	UPDATE ... SET ... = ..., ... WHERE ... = ... AND ... OR ... ORDER BY ..., ... LIMIT ...;

That rule leaves the following code with joined tables:

	Code:
	UPDATE verseny.palyaelem_adatok AS u INNER JOIN tavolsagok AS t ON t.ronk = u.ronk SET u.tavolsag_sum = t.tavolsag_sum WHERE 1 = 1;

mostly as

	Code:
	UPDATE verseny.palyaelem_adatok AS u INNER JOIN tavolsagok AS t ON t.ronk = u.ronk SET u.tavolsag_sum = t.tavolsag_sum WHERE 1 = 1;

I tried to merge it with the my SELECT rule of:

	Code:
	SELECT ... AS ... ,... INTO ... ,... FROM ... AS ... ,... JOIN ... ON ... = ... AND ... OR ... WHERE ... = ... AND ... OR ... GROUP BY ... ,... HAVING ... ,... ORDER BY ... ,... LIMIT ...;

and ended up with this:

	Code:
	UPDATE ... AS ... ,... JOIN ... ON ... = ... AND ... OR ... SET ... = ... WHERE ... = ... AND ... OR ... ORDER BY ... LIMIT ...;

But this formats the above code as:

	Code:
	UPDATE verseny.palyaelem_adatok AS u INNER JOIN tavolsagok AS t ON t.ronk = u.ronk SET u.tavolsag_sum = t.tavolsag_sum WHERE 1 = 1;

leaving the INNER keyword on a wrong line, which obviously was not my intention. The same fragment of rule (the part affecting JOINs) works as expected, that is, moving INNER/LEFT OUTER/RIGHT OUTER/etc together with the JOIN keyword. Any ideas about what's missing?

Do you have a separate formatting rule for JOIN. If yes, it might be interfering.

No. The only other rule having the word JOIN in it is for SELECT. Could that be interfering? Not that it's something I could afford to have disabled or missing, to be honest.

It shouldn't, the first keyboard is different.
What do you get if you add additional ... in front of JOIN?

It got worse:

	Code:
	UPDATE verseny.palyaelem_adatok AS u INNER JOIN ... tavolsagok AS t ON t.ronk = u.ronk SET u.tavolsag_sum = t.tavolsag_sum WHERE 1 = 1;

I tried brute force method and added a separate rule for INNER JOIN to place it on a new line

	Code:
	... INNER JOIN ...

And conceptually it does kind of what you want, except that it creates wrong indent for the INNER JOIN. I feel like it's reaching the limits of what the code formatting can do using the existing rules processing system without internal programmatic changes.

I guess I'll just live with one thing malformed and that will be UPDATE statements. I don't have many of those. Thanks for figuring this out.