postgres provider: remove attribute in reverse order (fixes #8142)

qgis · Jun 29, 2013 · 4a37805 · 4a37805
1 parent ee17616
commit 4a37805
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -462,27 +462,22 @@ void QgsVectorLayerEditBuffer::rollBack()
   Q_ASSERT( mAddedFeatures.isEmpty() );
 }
 
-
-
-
-
-/*QString QgsVectorLayerEditBuffer::dumpEditBuffer()
+#if 0
+QString QgsVectorLayerEditBuffer::dumpEditBuffer()
 {
   QString msg;
-  if (!mChangedGeometries.isEmpty())
+  if ( !mChangedGeometries.isEmpty() )
   {
     msg += "CHANGED GEOMETRIES:\n";
-    for (QgsGeometryMap::const_iterator it = mChangedGeometries.begin(); it != mChangedGeometries.end(); ++it)
+    for ( QgsGeometryMap::const_iterator it = mChangedGeometries.begin(); it != mChangedGeometries.end(); ++it )
     {
       // QgsFeatureId, QgsGeometry
-      msg += QString("- FID %1: %2").arg(it.key()).arg(it.value().to)
+      msg += QString( "- FID %1: %2" ).arg( it.key() ).arg( it.value().to );
     }
   }
   return msg;
-}*/
-
-
-
+}
+#endif
 
 void QgsVectorLayerEditBuffer::handleAttributeAdded( int index )
 {

diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -1509,11 +1509,6 @@ bool QgsOracleProvider::addAttributes( const QList<QgsField> &attributes )
   return returnvalue;
 }
 
-static int moreThan( int a, int b )
-{
-  return a > b;
-}
-
 bool QgsOracleProvider::deleteAttributes( const QgsAttributeIds& ids )
 {
   bool returnvalue = true;
@@ -1535,7 +1530,8 @@ bool QgsOracleProvider::deleteAttributes( const QgsAttributeIds& ids )
     qry.finish();
 
     QList<int> idsList = ids.values();
-    qSort( idsList.begin(), idsList.end(), moreThan );
+    qSort( idsList.begin(), idsList.end(), qGreater<int>() );
+
     foreach ( int id, idsList )
     {
       const QgsField &fld = mAttributeFields.at( id );

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1926,7 +1926,10 @@ bool QgsPostgresProvider::deleteAttributes( const QgsAttributeIds& ids )
   {
     mConnectionRW->PQexecNR( "BEGIN" );
 
-    for ( QgsAttributeIds::const_iterator iter = ids.begin(); iter != ids.end(); ++iter )
+    QList<int> idsList = ids.values();
+    qSort( idsList.begin(), idsList.end(), qGreater<int>() );
+
+    for ( QList<int>::const_iterator iter = idsList.begin(); iter != idsList.end(); ++iter )
     {
       int index = *iter;
       if ( index < 0 || index >= mAttributeFields.count() )