From 48e4fb85c800f63187f5ecc2b9f967ac87e90992 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 13 Jul 2015 11:06:29 +0200 Subject: [PATCH] Revert "use triple quoting with st_estimatedextent in postgres provider and db_manager (fixes #12478)" As it seems to address a meanwhile reverted behavior change in PostGIS 2.1 before it was released (see also https://trac.osgeo.org/postgis/ticket/2834). This reverts commit 048aff01bb9cf42e2c1c17eb0ddbd81537443e19. --- python/plugins/db_manager/db_plugins/postgis/connector.py | 4 ++-- src/providers/postgres/qgspostgresprovider.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py index f9978e3a063..7ab4212e8e5 100644 --- a/python/plugins/db_manager/db_plugins/postgis/connector.py +++ b/python/plugins/db_manager/db_plugins/postgis/connector.py @@ -572,10 +572,10 @@ class PostGisDBConnector(DBConnector): return schema, tablename = self.getSchemaTableName(table) - schema_part = u"%s," % self.quoteString( self.quoteId( schema) ) if schema is not None else "" + schema_part = u"%s," % self.quoteString(schema) if schema is not None else "" subquery = u"SELECT st_estimated_extent(%s%s,%s) AS extent" % ( - schema_part, self.quoteString( self.quoteId( tablename) ), self.quoteString(geom)) + schema_part, self.quoteString(tablename), self.quoteString(geom)) sql = u"""SELECT st_xmin(extent), st_ymin(extent), st_xmax(extent), st_ymax(extent) FROM (%s) AS subquery """ % subquery try: diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index bbb357c4eff..a05c52f31fd 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -2487,8 +2487,8 @@ QgsRectangle QgsPostgresProvider::extent() sql = QString( "SELECT %1(%2,%3,%4)" ) .arg( connectionRO()->majorVersion() < 2 ? "estimated_extent" : ( connectionRO()->majorVersion() == 2 && connectionRO()->minorVersion() < 1 ? "st_estimated_extent" : "st_estimatedextent" ) ) - .arg( quotedValue( quotedIdentifier( mSchemaName ) ) ) - .arg( quotedValue( quotedIdentifier( mTableName ) ) ) + .arg( quotedValue( mSchemaName ) ) + .arg( quotedValue( mTableName ) ) .arg( quotedValue( mGeometryColumn ) ); result = mConnectionRO->PQexec( sql ); if ( result.PQresultStatus() == PGRES_TUPLES_OK && result.PQntuples() == 1 && !result.PQgetisnull( 0, 0 ) )