@@ -328,15 +328,15 @@ QString QgsPgSourceSelect::layerURI( const QModelIndex &index )
328
328
329
329
if ( typeName == " POINT" )
330
330
{
331
- geomFilter = QString ( " st_geometrytype (\" %1\" ) IN ('POINT','MULTIPOINT')" ).arg ( geomColumnName );
331
+ geomFilter = QString ( " geometrytype (\" %1\" ) IN ('POINT','MULTIPOINT')" ).arg ( geomColumnName );
332
332
}
333
333
else if ( typeName == " LINESTRING" )
334
334
{
335
- geomFilter = QString ( " st_geometrytype (\" %1\" ) IN ('LINESTRING','MULTILINESTRING')" ).arg ( geomColumnName );
335
+ geomFilter = QString ( " geometrytype (\" %1\" ) IN ('LINESTRING','MULTILINESTRING')" ).arg ( geomColumnName );
336
336
}
337
337
else if ( typeName == " POLYGON" )
338
338
{
339
- geomFilter = QString ( " st_geometrytype (\" %1\" ) IN ('POLYGON','MULTIPOLYGON')" ).arg ( geomColumnName );
339
+ geomFilter = QString ( " geometrytype (\" %1\" ) IN ('POLYGON','MULTIPOLYGON')" ).arg ( geomColumnName );
340
340
}
341
341
342
342
if ( !geomFilter.isEmpty () && !sql.contains ( geomFilter ) )
@@ -941,9 +941,9 @@ void QgsGeomColumnTypeThread::getLayerTypes()
941
941
{
942
942
QString query = QString ( " select distinct "
943
943
" case"
944
- " when st_geometrytype (%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
945
- " when st_geometrytype (%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
946
- " when st_geometrytype (%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
944
+ " when geometrytype (%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
945
+ " when geometrytype (%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
946
+ " when geometrytype (%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
947
947
" end "
948
948
" from " ).arg ( " \" " + columns[i] + " \" " );
949
949
if ( mUseEstimatedMetadata )
0 commit comments