Skip to content

Commit f9652e5

Browse files
author
jef
committed
fix r15023: restore use of geometrytype as it's not deprecated and use
different geometry type notation git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15028 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f0da639 commit f9652e5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/app/postgres/qgspgsourceselect.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,15 +328,15 @@ QString QgsPgSourceSelect::layerURI( const QModelIndex &index )
328328

329329
if ( typeName == "POINT" )
330330
{
331-
geomFilter = QString( "st_geometrytype(\"%1\") IN ('POINT','MULTIPOINT')" ).arg( geomColumnName );
331+
geomFilter = QString( "geometrytype(\"%1\") IN ('POINT','MULTIPOINT')" ).arg( geomColumnName );
332332
}
333333
else if ( typeName == "LINESTRING" )
334334
{
335-
geomFilter = QString( "st_geometrytype(\"%1\") IN ('LINESTRING','MULTILINESTRING')" ).arg( geomColumnName );
335+
geomFilter = QString( "geometrytype(\"%1\") IN ('LINESTRING','MULTILINESTRING')" ).arg( geomColumnName );
336336
}
337337
else if ( typeName == "POLYGON" )
338338
{
339-
geomFilter = QString( "st_geometrytype(\"%1\") IN ('POLYGON','MULTIPOLYGON')" ).arg( geomColumnName );
339+
geomFilter = QString( "geometrytype(\"%1\") IN ('POLYGON','MULTIPOLYGON')" ).arg( geomColumnName );
340340
}
341341

342342
if ( !geomFilter.isEmpty() && !sql.contains( geomFilter ) )
@@ -941,9 +941,9 @@ void QgsGeomColumnTypeThread::getLayerTypes()
941941
{
942942
QString query = QString( "select distinct "
943943
"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'"
947947
" end "
948948
"from " ).arg( "\"" + columns[i] + "\"" );
949949
if ( mUseEstimatedMetadata )

src/providers/postgres/qgspostgresprovider.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3125,7 +3125,7 @@ bool QgsPostgresProvider::getGeometryDetails()
31253125
// Didn't find what we need in the geometry_columns table, so
31263126
// get stuff from the relevant column instead. This may (will?)
31273127
// fail if there is no data in the relevant table.
3128-
sql = QString( "select st_srid(%1),st_geometrytype(%1) from %2" )
3128+
sql = QString( "select st_srid(%1),geometrytype(%1) from %2" )
31293129
.arg( quotedIdentifier( geometryColumn ) )
31303130
.arg( mQuery );
31313131

@@ -3154,9 +3154,9 @@ bool QgsPostgresProvider::getGeometryDetails()
31543154
// check to see if there is a unique geometry type
31553155
sql = QString( "select distinct "
31563156
"case"
3157-
" when st_geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
3158-
" when st_geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
3159-
" when st_geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
3157+
" when geometrytype(%1) IN ('POINT','MULTIPOINT') THEN 'POINT'"
3158+
" when geometrytype(%1) IN ('LINESTRING','MULTILINESTRING') THEN 'LINESTRING'"
3159+
" when geometrytype(%1) IN ('POLYGON','MULTIPOLYGON') THEN 'POLYGON'"
31603160
" end "
31613161
"from " ).arg( quotedIdentifier( geometryColumn ) );
31623162
if ( mUseEstimatedMetadata )

0 commit comments

Comments
 (0)