Fix indentation in HANA provider

qgis · Dec 7, 2020 · 471bb80 · 471bb80
1 parent 00b7554
commit 471bb80
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/src/providers/hana/qgshanaexpressioncompiler.cpp b/src/providers/hana/qgshanaexpressioncompiler.cpp
@@ -133,27 +133,27 @@ QgsSqlExpressionCompiler::Result QgsHanaExpressionCompiler::compileNode(
     }
     break;
     case QgsExpressionNode::ntUnaryOperator:
+    {
+      const QgsExpressionNodeUnaryOperator *unaryOp = static_cast<const QgsExpressionNodeUnaryOperator *>( node );
+      switch ( unaryOp->op() )
       {
-        const QgsExpressionNodeUnaryOperator *unaryOp = static_cast<const QgsExpressionNodeUnaryOperator *>( node );
-        switch ( unaryOp->op() )
+        case QgsExpressionNodeUnaryOperator::uoNot:
         {
-            case QgsExpressionNodeUnaryOperator::uoNot:
-            {
-                Result resRight = compileNode( unaryOp->operand(), result );
-                if ( "NULL" == result.toUpper() )
-                {
-                  result.clear();
-                  return Fail;
-                }
-                result = "NOT " + result;
-
-                return resRight;
-            }
-            case QgsExpressionNodeUnaryOperator::uoMinus:
-              break;
+          Result resRight = compileNode( unaryOp->operand(), result );
+          if ( "NULL" == result.toUpper() )
+          {
+            result.clear();
+            return Fail;
+          }
+          result = "NOT " + result;
+
+          return resRight;
         }
+        case QgsExpressionNodeUnaryOperator::uoMinus:
+          break;
       }
-      break;
+    }
+    break;
     case QgsExpressionNode::ntBinaryOperator:
     {
       const QgsExpressionNodeBinaryOperator *binOp( static_cast<const QgsExpressionNodeBinaryOperator *>( node ) );
@@ -165,10 +165,10 @@ QgsSqlExpressionCompiler::Result QgsHanaExpressionCompiler::compileNode(
 
       if ( resLeft == Fail || resRight == Fail )
         return Fail;
-
       // NULL can not appear on the left, only as part of IS NULL or IS NOT NULL
       if ( "NULL" == opLeft.toUpper() )
         return Fail;
+
       // NULL can only be on the right for IS and IS NOT
       if ( "NULL" == opRight.toUpper() &&
            ( binOp->op() != QgsExpressionNodeBinaryOperator::boIs && binOp->op() != QgsExpressionNodeBinaryOperator::boIsNot ) )

diff --git a/src/providers/hana/qgshanafeatureiterator.cpp b/src/providers/hana/qgshanafeatureiterator.cpp
@@ -377,11 +377,11 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
     {
       QgsHanaExpressionCompiler compiler = QgsHanaExpressionCompiler( mSource );
       QgsSqlExpressionCompiler::Result result = compiler.compile( request.filterExpression() );
-      switch(result)
-      {
-      case QgsSqlExpressionCompiler::Result::Complete:
-      case QgsSqlExpressionCompiler::Result::Partial:
+      switch ( result )
       {
+        case QgsSqlExpressionCompiler::Result::Complete:
+        case QgsSqlExpressionCompiler::Result::Partial:
+        {
           QString filterExpr = compiler.result();
           if ( !filterExpr.isEmpty() )
           {
@@ -391,13 +391,13 @@ QString QgsHanaFeatureIterator::buildSqlQuery( const QgsFeatureRequest &request
             mExpressionCompiled = ( result == QgsSqlExpressionCompiler::Result::Complete );
             mCompileStatus = ( mExpressionCompiled ? Compiled : PartiallyCompiled );
           }
-      }
-      break;
-      case QgsSqlExpressionCompiler::Result::Fail:
-          QgsDebugMsg(QStringLiteral("Unable to compile filter expression: '%1'")
-                      .arg(request.filterExpression()->expression()).toStdString().c_str());
+        }
+        break;
+        case QgsSqlExpressionCompiler::Result::Fail:
+          QgsDebugMsg( QStringLiteral( "Unable to compile filter expression: '%1'" )
+                       .arg( request.filterExpression()->expression() ).toStdString().c_str() );
           break;
-      case QgsSqlExpressionCompiler::Result::None:
+        case QgsSqlExpressionCompiler::Result::None:
           break;
       }
       if ( result != QgsSqlExpressionCompiler::Result::Complete )