[postgres] Fix estimated metadata queries fail for huge tables

nyalldawson · nyalldawson · commit dcc9f11c8683 · 2019-03-11T07:46:08.000+10:00
Fixes #21517
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3190,7 +3190,7 @@ long QgsPostgresProvider::featureCount() const
   // - but make huge dataset usable.
   if ( !mIsQuery && mUseEstimatedMetadata )
   {
-    sql = QStringLiteral( "SELECT reltuples::int FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );
+    sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );
   }
   else
   {
@@ -3249,7 +3249,7 @@ QgsRectangle QgsPostgresProvider::extent() const
       {
         if ( result.PQgetvalue( 0, 0 ).toInt() > 0 )
         {
-          sql = QStringLiteral( "SELECT reltuples::int FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );
+          sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );
           result = connectionRO()->PQexec( sql );
           if ( result.PQresultStatus() == PGRES_TUPLES_OK
                && result.PQntuples() == 1

Original file line number	Diff line number	Diff line change
`@@ -3190,7 +3190,7 @@ long QgsPostgresProvider::featureCount() const`
`3190`	`3190`	`// - but make huge dataset usable.`
`3191`	`3191`	`if ( !mIsQuery && mUseEstimatedMetadata )`
`3192`	`3192`	`{`
`3193`		`- sql = QStringLiteral( "SELECT reltuples::int FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
	`3193`	`+ sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
`3194`	`3194`	`}`
`3195`	`3195`	`else`
`3196`	`3196`	`{`
`@@ -3249,7 +3249,7 @@ QgsRectangle QgsPostgresProvider::extent() const`
`3249`	`3249`	`{`
`3250`	`3250`	`if ( result.PQgetvalue( 0, 0 ).toInt() > 0 )`
`3251`	`3251`	`{`
`3252`		`- sql = QStringLiteral( "SELECT reltuples::int FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
	`3252`	`+ sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
`3253`	`3253`	`result = connectionRO()->PQexec( sql );`
`3254`	`3254`	`if ( result.PQresultStatus() == PGRES_TUPLES_OK`
`3255`	`3255`	`&& result.PQntuples() == 1`