Skip to content

Commit a47baba

Browse files
committed
postgres provider changes:
- ignore infinite filter rectangles - also disconnect selection connection if no supported layers were found
1 parent cb48f51 commit a47baba

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/providers/postgres/qgscolumntypethread.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ void QgsGeomColumnTypeThread::run()
6262
mAllowGeometrylessTables ) ||
6363
layerProperties.isEmpty() )
6464
{
65+
mConn->disconnect();
66+
mConn = 0;
6567
return;
6668
}
6769

src/providers/postgres/qgspostgresfeatureiterator.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,12 @@ QString QgsPostgresFeatureIterator::whereClauseRect()
210210
if ( P->mSpatialColType == sctGeography )
211211
{
212212
rect = QgsRectangle( -180.0, -90.0, 180.0, 90.0 ).intersect( &rect );
213-
if ( !rect.isFinite() )
214-
return "false";
213+
}
214+
215+
if ( !rect.isFinite() )
216+
{
217+
QgsMessageLog::logMessage( QObject::tr( "Infinite filter rectangle specified" ), QObject::tr( "PostGIS" ) );
218+
return "false";
215219
}
216220

217221
QString qBox;

0 commit comments

Comments
 (0)