src/providers/gdal/qgsgdalprovider.cpp

@@ -280,7 +280,7 @@ QgsGdalProvider::QgsGdalProvider( QString const & uri )
       }
     }
     mNoDataValue.append( myNoDataValue );
-    QgsDebugMsg( QString( "mNoDataValue[%1] = %1" ).arg( i - 1 ).arg( mNoDataValue[i-1] ) );
+    QgsDebugMsg( QString( "mNoDataValue[%1] = %2" ).arg( i - 1 ).arg( mNoDataValue[i-1] ) );
   }
 
   mValid = true;
@@ -1512,11 +1512,8 @@ QList<QgsRasterPyramid> QgsGdalProvider::buildPyramidList()
     myRasterPyramid.xDim = ( int )( 0.5 + ( myWidth / ( double )myDivisor ) );
     myRasterPyramid.yDim = ( int )( 0.5 + ( myHeight / ( double )myDivisor ) );
     myRasterPyramid.exists = false;
-#ifdef QGISDEBUG
-    QgsLogger::debug( "Pyramid", myRasterPyramid.level, 1, __FILE__, __FUNCTION__, __LINE__ );
-    QgsLogger::debug( "xDim", myRasterPyramid.xDim, 1, __FILE__, __FUNCTION__, __LINE__ );
-    QgsLogger::debug( "yDim", myRasterPyramid.yDim, 1, __FILE__, __FUNCTION__, __LINE__ );
-#endif
+
+    QgsDebugMsg( QString( "Pyramid %1 xDim %2 yDim %3" ).arg( myRasterPyramid.level ).arg( myRasterPyramid.xDim ).arg( myRasterPyramid.yDim ) );
 
     //
     // Now we check if it actually exists in the raster layer

src/providers/gdal/qgsgdalprovider.h

@@ -256,6 +256,9 @@ class QgsGdalProvider : public QgsRasterDataProvider
     /** Emit a signal to notify of the progress event. */
     void emitProgress( int theType, double theProgress, QString theMessage );
 
+  signals:
+    void statusChanged( QString );
+
   private:
     // initialize CRS from wkt
     bool crsFromWkt( const char *wkt );

src/providers/postgres/qgspostgresprovider.cpp

@@ -2029,25 +2029,11 @@ QString QgsPostgresProvider::getPrimaryKey()
                 .arg( quotedValue( mQuery ) );
 
           Result ctidCheck = connectionRO->PQexec( sql );
-
           if ( PQntuples( ctidCheck ) == 1 )
           {
-            sql = QString( "SELECT max(substring(ctid::text from E'\\\\((\\\\d+),\\\\d+\\\\)')::integer) from %1" )
-                  .arg( mQuery );
-
-            Result ctidCheck = connectionRO->PQexec( sql );
-            if ( PQntuples( ctidCheck ) == 1 )
-            {
-              int id = QString( PQgetvalue( ctidCheck, 0, 0 ) ).toInt();
-
-              if ( id < 0x10000 )
-              {
-                // fallback to ctid
-                primaryKey = "ctid";
-                primaryKeyType = "tid";
-                mIsDbPrimaryKey = true;
-              }
-            }
+            primaryKey = "ctid";
+            primaryKeyType = "tid";
+            mIsDbPrimaryKey = true;
           }
         }