[mssql] Small fixes to expression compilation

nyalldawson · nyalldawson · commit 84a821915e41 · 2018-10-08T16:15:31.000+10:00
- Use [] to correctly quote field names instead of "" - Don't invalidate provider side limit when not required Forward port of 8dec70c, because I'm only human and forgot
diff --git a/src/providers/mssql/qgsmssqlexpressioncompiler.cpp b/src/providers/mssql/qgsmssqlexpressioncompiler.cpp
@@ -91,6 +91,15 @@ QString QgsMssqlExpressionCompiler::quotedValue( const QVariant &value, bool &ok
   }
 }
 
+QString QgsMssqlExpressionCompiler::quotedIdentifier( const QString &identifier )
+{
+  QString quoted = identifier;
+  quoted.replace( '[', "[[" );
+  quoted.replace( ']', "]]" );
+  quoted = quoted.prepend( '[' ).append( ']' );
+  return quoted;
+}
+
 QString QgsMssqlExpressionCompiler::castToReal( const QString &value ) const
 {
   return QStringLiteral( "CAST((%1) AS REAL)" ).arg( value );
diff --git a/src/providers/mssql/qgsmssqlexpressioncompiler.h b/src/providers/mssql/qgsmssqlexpressioncompiler.h
@@ -29,6 +29,7 @@ class QgsMssqlExpressionCompiler : public QgsSqlExpressionCompiler
   protected:
     Result compileNode( const QgsExpressionNode *node, QString &result ) override;
     QString quotedValue( const QVariant &value, bool &ok ) override;
+    QString quotedIdentifier( const QString& identifier ) override;
     QString castToReal( const QString &value ) const override;
     QString castToInt( const QString &value ) const override;
     QString sqlFunctionFromFunctionName( const QString &fnName ) const override;
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -265,7 +265,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest &request )
     mOrderByCompiled = false;
   }
 
-  if ( !mOrderByCompiled )
+  if ( !mOrderByCompiled && !request.orderBy().isEmpty() )
     limitAtProvider = false;
 
   if ( request.limit() >= 0 && limitAtProvider )

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,15 @@ QString QgsMssqlExpressionCompiler::quotedValue( const QVariant &value, bool &ok`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
	`94`	`+QString QgsMssqlExpressionCompiler::quotedIdentifier( const QString &identifier )`
	`95`	`+{`
	`96`	`+ QString quoted = identifier;`
	`97`	`+ quoted.replace( '[', "[[" );`
	`98`	`+ quoted.replace( ']', "]]" );`
	`99`	`+ quoted = quoted.prepend( '[' ).append( ']' );`
	`100`	`+ return quoted;`
	`101`	`+}`
	`102`	`+`
`94`	`103`	`QString QgsMssqlExpressionCompiler::castToReal( const QString &value ) const`
`95`	`104`	`{`
`96`	`105`	`return QStringLiteral( "CAST((%1) AS REAL)" ).arg( value );`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest &request )`
`265`	`265`	`mOrderByCompiled = false;`
`266`	`266`	`}`
`267`	`267`
`268`		`- if ( !mOrderByCompiled )`
	`268`	`+ if ( !mOrderByCompiled && !request.orderBy().isEmpty() )`
`269`	`269`	`limitAtProvider = false;`
`270`	`270`
`271`	`271`	`if ( request.limit() >= 0 && limitAtProvider )`