From 3565aad630864ecdbe53fdaa501ea708555b3c7c Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 30 Apr 2023 18:30:36 -0400 Subject: New upstream version 3.4.4+dfsg. --- Plugins/SqlEnterpriseFormatter/formatselect.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Plugins/SqlEnterpriseFormatter/formatselect.cpp') diff --git a/Plugins/SqlEnterpriseFormatter/formatselect.cpp b/Plugins/SqlEnterpriseFormatter/formatselect.cpp index 37559eb..385f1a0 100644 --- a/Plugins/SqlEnterpriseFormatter/formatselect.cpp +++ b/Plugins/SqlEnterpriseFormatter/formatselect.cpp @@ -1,5 +1,4 @@ #include "formatselect.h" -#include "formatwith.h" #include "parser/ast/sqlitewith.h" #include "parser/ast/sqlitewindowdefinition.h" @@ -208,9 +207,15 @@ void FormatSelectCoreJoinOp::formatInternal() if (joinOp->naturalKw) keywords << "NATURAL"; - if (joinOp->leftKw) + if (joinOp->leftKw || joinOp->fullKw || joinOp->rightKw) { - keywords << "LEFT"; + if (joinOp->leftKw) + keywords << "LEFT"; + else if (joinOp->fullKw) + keywords << "FULL"; + else if (joinOp->rightKw) + keywords << "RIGHT"; + if (joinOp->outerKw) keywords << "OUTER"; } -- cgit v1.2.3