aboutsummaryrefslogtreecommitdiffstats
path: root/Plugins/SqlEnterpriseFormatter/formatselect.cpp
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2023-04-30 18:31:18 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2023-04-30 18:31:18 -0400
commit4de57f628bc74f00ba1885e91c84ea07c5405d8f (patch)
tree5d91900751e826d491ff1b2ebc571a787e84f864 /Plugins/SqlEnterpriseFormatter/formatselect.cpp
parent74d881cefa9097e58e129e37b9c44d680d8c7dfe (diff)
parent3565aad630864ecdbe53fdaa501ea708555b3c7c (diff)
Update upstream source from tag 'upstream/3.4.4+dfsg'
Update to upstream version '3.4.4+dfsg' with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed
Diffstat (limited to 'Plugins/SqlEnterpriseFormatter/formatselect.cpp')
-rw-r--r--Plugins/SqlEnterpriseFormatter/formatselect.cpp11
1 files changed, 8 insertions, 3 deletions
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";
}