Merge pull request #30192 from elpaso/pg-oid

Use Oid alias instead of unsigned int in PG provider
qgis · Jun 13, 2019 · 2ba1a93 · 2ba1a93
1 parent 0eadac6
commit 2ba1a93
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -107,7 +107,7 @@ QString QgsPostgresResult::PQfname( int col )
   return QString::fromUtf8( ::PQfname( mRes, col ) );
 }
 
-unsigned int QgsPostgresResult::PQftable( int col )
+Oid QgsPostgresResult::PQftable( int col )
 {
   Q_ASSERT( mRes );
   return ::PQftable( mRes, col );

diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -167,7 +167,7 @@ class QgsPostgresResult
 
     int PQnfields();
     QString PQfname( int col );
-    unsigned int PQftable( int col );
+    Oid PQftable( int col );
     Oid PQftype( int col );
     int PQfmod( int col );
     int PQftablecol( int col );

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -772,7 +772,7 @@ bool QgsPostgresProvider::loadFields()
   if ( result.PQnfields() > 0 )
   {
     // Collect table oids
-    QSet<unsigned int> tableoids;
+    QSet<Oid> tableoids;
     for ( int i = 0; i < result.PQnfields(); i++ )
     {
       Oid tableoid = result.PQftable( i );
@@ -834,7 +834,7 @@ bool QgsPostgresProvider::loadFields()
     Oid fldtyp = result.PQftype( i );
     int fldMod = result.PQfmod( i );
     int fieldPrec = -1;
-    unsigned int tableoid = result.PQftable( i );
+    Oid tableoid = result.PQftable( i );
     int attnum = result.PQftablecol( i );
     Oid atttypid = attTypeIdMap[tableoid][attnum];