Use ST_Force2D from PostGIS-2.1.0 up

Sandro Santilli · Sandro Santilli · commit a525dbd82109 · 2015-03-04T10:37:25.000+01:00
diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -322,7 +322,12 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause )
     if ( mSource->mForce2d )
     {
       geom = QString( "%1(%2)" )
-             .arg( mConn->majorVersion() < 2 ? "force_2d" : "st_force_2d" )
+                   // Force_2D before 2.0
+             .arg( mConn->majorVersion() < 2 ? "force_2d"
+                   // ST_Force2D since 2.1.0
+                   : mConn->majorVersion() > 2 || mConn->minorVersion() > 0 ? "st_force2d"
+                   // ST_Force_2D in 2.0.x
+                   : "st_force_2d" )
              .arg( geom );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,12 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString& whereClause )`
`322`	`322`	`if ( mSource->mForce2d )`
`323`	`323`	`{`
`324`	`324`	`geom = QString( "%1(%2)" )`
`325`		`- .arg( mConn->majorVersion() < 2 ? "force_2d" : "st_force_2d" )`
	`325`	`+ // Force_2D before 2.0`
	`326`	`+ .arg( mConn->majorVersion() < 2 ? "force_2d"`
	`327`	`+ // ST_Force2D since 2.1.0`
	`328`	`+ : mConn->majorVersion() > 2 \|\| mConn->minorVersion() > 0 ? "st_force2d"`
	`329`	`+ // ST_Force_2D in 2.0.x`
	`330`	`+ : "st_force_2d" )`
`326`	`331`	`.arg( geom );`
`327`	`332`	`}`
`328`	`333`