[mssql] Allow compilation of int div expressions

qgis · Oct 5, 2018 · 1d9086c · 1d9086c
1 parent 4a687a0
commit 1d9086c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/providers/mssql/qgsmssqlexpressioncompiler.cpp b/src/providers/mssql/qgsmssqlexpressioncompiler.cpp
@@ -83,3 +83,8 @@ QString QgsMssqlExpressionCompiler::castToReal( const QString &value ) const
 {
   return QStringLiteral( "CAST((%1) AS REAL)" ).arg( value );
 }
+
+QString QgsMssqlExpressionCompiler::castToInt( const QString &value ) const
+{
+  return QStringLiteral( "CAST((%1) AS integer)" ).arg( value );
+}
diff --git a/src/providers/mssql/qgsmssqlexpressioncompiler.h b/src/providers/mssql/qgsmssqlexpressioncompiler.h
@@ -30,6 +30,7 @@ class QgsMssqlExpressionCompiler : public QgsSqlExpressionCompiler
     Result compileNode( const QgsExpressionNode *node, QString &result ) override;
     QString quotedValue( const QVariant &value, bool &ok ) override;
     QString castToReal( const QString &value ) const override;
+    QString castToInt( const QString &value ) const override;
 
 };
 

diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -122,7 +122,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest &request )
     mStatement += QStringLiteral( ",[%1]" ).arg( mSource->mGeometryColName );
   }
 
-  mStatement += QStringLiteral( "FROM [%1].[%2]" ).arg( mSource->mSchemaName, mSource->mTableName );
+  mStatement += QStringLiteral( " FROM [%1].[%2]" ).arg( mSource->mSchemaName, mSource->mTableName );
 
   bool filterAdded = false;
   // set spatial filter

diff --git a/tests/src/python/test_provider_mssql.py b/tests/src/python/test_provider_mssql.py
@@ -85,7 +85,6 @@ def uncompiledFilters(self):
             '\'x\' || "name" IS NOT NULL',
             '\'x\' || "name" IS NULL',
             '"name" ~ \'[OP]ra[gne]+\'',
-            'pk = 9 // 4',
             'false and NULL',
             'true and NULL',
             'NULL and false',