[virtual layer] Fix geometry column detection for types with Z

Hugo Mercier · Hugo Mercier · commit 23c305b2a0c0 · 2017-02-27T10:32:28.000+01:00
diff --git a/src/providers/virtual/qgsvirtuallayerqueryparser.cpp b/src/providers/virtual/qgsvirtuallayerqueryparser.cpp
@@ -116,7 +116,7 @@ namespace QgsVirtualLayerQueryParser
       int pos = geometryTypeRx.indexIn( columnType, 0 );
       if ( pos != -1 )
       {
-        QgsWkbTypes::Type type = static_cast<QgsWkbTypes::Type>( geometryTypeRx.cap( 1 ).toInt() );
+        QgsWkbTypes::Type type = static_cast<QgsWkbTypes::Type>( geometryTypeRx.cap( 1 ).toLong() );
         long srid = geometryTypeRx.cap( 2 ).toLong();
         d.setGeometry( type );
         d.setSrid( srid );

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ namespace QgsVirtualLayerQueryParser`
`116`	`116`	`int pos = geometryTypeRx.indexIn( columnType, 0 );`
`117`	`117`	`if ( pos != -1 )`
`118`	`118`	`{`
`119`		`- QgsWkbTypes::Type type = static_cast<QgsWkbTypes::Type>( geometryTypeRx.cap( 1 ).toInt() );`
	`119`	`+ QgsWkbTypes::Type type = static_cast<QgsWkbTypes::Type>( geometryTypeRx.cap( 1 ).toLong() );`
`120`	`120`	`long srid = geometryTypeRx.cap( 2 ).toLong();`
`121`	`121`	`d.setGeometry( type );`
`122`	`122`	`d.setSrid( srid );`