[OGR provider] Use QgsSQLiteExpressionCompiler for SQLite and GPKG drivers

rouault · rouault · commit 328eaade33fd · 2016-04-26T11:46:20.000+02:00
diff --git a/src/providers/ogr/qgsogrexpressioncompiler.cpp b/src/providers/ogr/qgsogrexpressioncompiler.cpp
@@ -35,16 +35,12 @@ QgsSqlExpressionCompiler::Result QgsOgrExpressionCompiler::compile( const QgsExp
     return Fail;
   else if ( mSource->mDriverName == "OCI" )
     return Fail;
-  else if ( mSource->mDriverName == "SQLite" )
-    return Fail;
   else if ( mSource->mDriverName == "ODBC" )
     return Fail;
   else if ( mSource->mDriverName == "PGeo" )
     return Fail;
   else if ( mSource->mDriverName == "MSSQLSpatial" )
     return Fail;
-  else if ( mSource->mDriverName == "GPKG" )
-    return Fail;
 
   return QgsSqlExpressionCompiler::compile( exp );
 }
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -17,6 +17,7 @@
 #include "qgsogrprovider.h"
 #include "qgsogrgeometrysimplifier.h"
 #include "qgsogrexpressioncompiler.h"
+#include "qgssqliteexpressioncompiler.h"
 
 #include "qgsogrutils.h"
 #include "qgsapplication.h"
@@ -100,13 +101,20 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
   if ( request.filterType() == QgsFeatureRequest::FilterExpression
        && QSettings().value( "/qgis/compileExpressions", true ).toBool() )
   {
-    QgsOgrExpressionCompiler compiler = QgsOgrExpressionCompiler( source );
-
-    QgsSqlExpressionCompiler::Result result = compiler.compile( request.filterExpression() );
+    QgsSqlExpressionCompiler* compiler;
+    if ( source->mDriverName == "SQLite" || source->mDriverName == "GPKG" )
+    {
+      compiler = new QgsSQLiteExpressionCompiler( source->mFields );
+    }
+    else
+    {
+      compiler = new QgsOgrExpressionCompiler( source );
+    }
 
+    QgsSqlExpressionCompiler::Result result = compiler->compile( request.filterExpression() );
     if ( result == QgsSqlExpressionCompiler::Complete || result == QgsSqlExpressionCompiler::Partial )
     {
-      QString whereClause = compiler.result();
+      QString whereClause = compiler->result();
       if ( OGR_L_SetAttributeFilter( ogrLayer, mSource->mEncoding->fromUnicode( whereClause ).constData() ) == OGRERR_NONE )
       {
         //if only partial success when compiling expression, we need to double-check results using QGIS' expressions
@@ -118,6 +126,8 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
     {
       OGR_L_SetAttributeFilter( ogrLayer, nullptr );
     }
+
+    delete compiler;
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include "qgsogrprovider.h"`
`18`	`18`	`#include "qgsogrgeometrysimplifier.h"`
`19`	`19`	`#include "qgsogrexpressioncompiler.h"`
	`20`	`+#include "qgssqliteexpressioncompiler.h"`
`20`	`21`
`21`	`22`	`#include "qgsogrutils.h"`
`22`	`23`	`#include "qgsapplication.h"`
`@@ -100,13 +101,20 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`100`	`101`	`if ( request.filterType() == QgsFeatureRequest::FilterExpression`
`101`	`102`	`&& QSettings().value( "/qgis/compileExpressions", true ).toBool() )`
`102`	`103`	`{`
`103`		`- QgsOgrExpressionCompiler compiler = QgsOgrExpressionCompiler( source );`
`104`		`-`
`105`		`- QgsSqlExpressionCompiler::Result result = compiler.compile( request.filterExpression() );`
	`104`	`+ QgsSqlExpressionCompiler* compiler;`
	`105`	`+ if ( source->mDriverName == "SQLite" \|\| source->mDriverName == "GPKG" )`
	`106`	`+ {`
	`107`	`+ compiler = new QgsSQLiteExpressionCompiler( source->mFields );`
	`108`	`+ }`
	`109`	`+ else`
	`110`	`+ {`
	`111`	`+ compiler = new QgsOgrExpressionCompiler( source );`
	`112`	`+ }`
`106`	`113`
	`114`	`+ QgsSqlExpressionCompiler::Result result = compiler->compile( request.filterExpression() );`
`107`	`115`	`if ( result == QgsSqlExpressionCompiler::Complete \|\| result == QgsSqlExpressionCompiler::Partial )`
`108`	`116`	`{`
`109`		`- QString whereClause = compiler.result();`
	`117`	`+ QString whereClause = compiler->result();`
`110`	`118`	`if ( OGR_L_SetAttributeFilter( ogrLayer, mSource->mEncoding->fromUnicode( whereClause ).constData() ) == OGRERR_NONE )`
`111`	`119`	`{`
`112`	`120`	`//if only partial success when compiling expression, we need to double-check results using QGIS' expressions`
`@@ -118,6 +126,8 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`118`	`126`	`{`
`119`	`127`	`OGR_L_SetAttributeFilter( ogrLayer, nullptr );`
`120`	`128`	`}`
	`129`	`+`
	`130`	`+ delete compiler;`
`121`	`131`	`}`
`122`	`132`	`else`
`123`	`133`	`{`