[mssql] Fix integer division compilation

nyalldawson · nyalldawson · commit 4a687a07f7df · 2018-10-05T11:34:49.000+10:00
Makes sql server provider pass conformance tests again!
diff --git a/src/providers/mssql/qgsmssqlexpressioncompiler.cpp b/src/providers/mssql/qgsmssqlexpressioncompiler.cpp
@@ -18,7 +18,7 @@
 
 QgsMssqlExpressionCompiler::QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *source )
   : QgsSqlExpressionCompiler( source->mFields,
-                              QgsSqlExpressionCompiler::LikeIsCaseInsensitive | QgsSqlExpressionCompiler::CaseInsensitiveStringMatch )
+                              QgsSqlExpressionCompiler::LikeIsCaseInsensitive | QgsSqlExpressionCompiler::CaseInsensitiveStringMatch | QgsSqlExpressionCompiler::IntegerDivisionResultsInInteger )
 {
 
 }
@@ -78,3 +78,8 @@ QString QgsMssqlExpressionCompiler::quotedValue( const QVariant &value, bool &ok
       return QgsSqlExpressionCompiler::quotedValue( value, ok );
   }
 }
+
+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 castToReal( const QString &value ) const override;
 
 };
 

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`QgsMssqlExpressionCompiler::QgsMssqlExpressionCompiler( QgsMssqlFeatureSource *source )`
`20`	`20`	`: QgsSqlExpressionCompiler( source->mFields,`
`21`		`- QgsSqlExpressionCompiler::LikeIsCaseInsensitive \| QgsSqlExpressionCompiler::CaseInsensitiveStringMatch )`
	`21`	`+ QgsSqlExpressionCompiler::LikeIsCaseInsensitive \| QgsSqlExpressionCompiler::CaseInsensitiveStringMatch \| QgsSqlExpressionCompiler::IntegerDivisionResultsInInteger )`
`22`	`22`	`{`
`23`	`23`
`24`	`24`	`}`
`@@ -78,3 +78,8 @@ QString QgsMssqlExpressionCompiler::quotedValue( const QVariant &value, bool &ok`
`78`	`78`	`return QgsSqlExpressionCompiler::quotedValue( value, ok );`
`79`	`79`	`}`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+QString QgsMssqlExpressionCompiler::castToReal( const QString &value ) const`
	`83`	`+{`
	`84`	`+ return QStringLiteral( "CAST((%1) AS REAL)" ).arg( value );`
	`85`	`+}`