[postgres] Fix estimated metadata queries fail for huge tables

nyalldawson · nyalldawson · commit c1089238418c · 2019-03-08T01:19:27.000Z
Fixes #21517
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3187,7 +3187,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
   {
@@ -3246,7 +3246,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
`@@ -3187,7 +3187,7 @@ long QgsPostgresProvider::featureCount() const`
`3187`	`3187`	`// - but make huge dataset usable.`
`3188`	`3188`	`if ( !mIsQuery && mUseEstimatedMetadata )`
`3189`	`3189`	`{`
`3190`		`- sql = QStringLiteral( "SELECT reltuples::int FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
	`3190`	`+ sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
`3191`	`3191`	`}`
`3192`	`3192`	`else`
`3193`	`3193`	`{`
`@@ -3246,7 +3246,7 @@ QgsRectangle QgsPostgresProvider::extent() const`
`3246`	`3246`	`{`
`3247`	`3247`	`if ( result.PQgetvalue( 0, 0 ).toInt() > 0 )`
`3248`	`3248`	`{`
`3249`		`- sql = QStringLiteral( "SELECT reltuples::int FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
	`3249`	`+ sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );`
`3250`	`3250`	`result = connectionRO()->PQexec( sql );`
`3251`	`3251`	`if ( result.PQresultStatus() == PGRES_TUPLES_OK`
`3252`	`3252`	`&& result.PQntuples() == 1`