From feda8a7db8d1d7c5439aa8f8feef7cc0dd2b59a0 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 27 Jul 2018 23:51:12 -0400 Subject: New upstream version 3.2.1+dfsg1 --- Plugins/SqlEnterpriseFormatter/formatselect.cpp | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'Plugins/SqlEnterpriseFormatter/formatselect.cpp') diff --git a/Plugins/SqlEnterpriseFormatter/formatselect.cpp b/Plugins/SqlEnterpriseFormatter/formatselect.cpp index d2173c5..f5aa55e 100644 --- a/Plugins/SqlEnterpriseFormatter/formatselect.cpp +++ b/Plugins/SqlEnterpriseFormatter/formatselect.cpp @@ -142,11 +142,27 @@ void FormatSelectCoreSingleSource::formatInternal() withKeyword("AS"); withId(singleSource->alias); + } + + if (singleSource->indexedByKw) + withKeyword("INDEXED").withKeyword("BY").withId(singleSource->indexedBy); + else if (singleSource->notIndexedKw) + withKeyword("NOT").withKeyword("INDEXED"); + } + else if (!singleSource->funcName.isNull()) + { + if (!singleSource->database.isNull()) + withId(singleSource->database).withIdDot(); + + withId(singleSource->funcName).withParFuncLeft() + .withStatementList(singleSource->funcParams, "funcArgs", FormatStatement::ListSeparator::EXPR_COMMA).withParFuncRight(); - if (singleSource->indexedByKw) - withKeyword("INDEXED").withKeyword("BY").withId(singleSource->indexedBy); - else if (singleSource->notIndexedKw) - withKeyword("NOT").withKeyword("INDEXED"); + if (!singleSource->alias.isNull()) + { + if (singleSource->asKw) + withKeyword("AS"); + + withId(singleSource->alias); } } else if (singleSource->select) -- cgit v1.2.3