Fix to make deletion of postgres columns working again

mhugent · mhugent · commit 0174afd26a5b · 2007-07-06T13:39:41.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@7063 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributetable.cpp b/src/app/qgsattributetable.cpp
@@ -356,9 +356,7 @@ void QgsAttributeTable::deleteAttribute(const QString& name)
     }
     else
     {
-	QgsDebugMsg("QgsAttributeTable: deleteAttribute " + name);
-  
-  // TODO: [MD] mDeletedAttributes.insert(name);
+	mDeletedAttributes.insert(name); 
 	removeAttrColumn(name);
     }
     mEdited=true;
diff --git a/src/app/qgsattributetable.h b/src/app/qgsattributetable.h
@@ -130,7 +130,7 @@ class QgsAttributeTable:public Q3Table
       and the value the attribute type*/
     QgsNewAttributesMap mAddedAttributes;
     /**Set containing the attribute names of deleted attributes*/
-    QgsFeatureIds mDeletedAttributes;
+    QgsDeletedAttributesSet mDeletedAttributes;
     /**Nested map containing the changed attribute values. The int is the feature id, 
       the first QString the attribute name and the second QString the new value*/
     QgsChangedAttributesMap mChangedValues;
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -82,7 +82,7 @@ bool QgsVectorDataProvider::addAttributes(const QgsNewAttributesMap & attributes
   return false;
 }
 
-bool QgsVectorDataProvider::deleteAttributes(const QgsAttributeIds & attributes)
+bool QgsVectorDataProvider::deleteAttributes(const QgsAttributeIds& attributes)
 {
   return false;
 }
@@ -220,15 +220,13 @@ QString QgsVectorDataProvider::capabilitiesString() const
 int QgsVectorDataProvider::indexFromFieldName(const QString& fieldName) const
 {
   const QgsFieldMap& theFields = fields();
-  int counter = 0;
 
   for (QgsFieldMap::const_iterator it = theFields.begin(); it != theFields.end(); ++it)
   {
     if(it->name() == fieldName)
     {
-      return counter;
+      return it.key();
     }
-    ++counter;
   }
   return -1;
 }
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -190,10 +190,10 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
 
       /**
        * Deletes existing attributes
-       * @param attributes a set containing indexes of attributes
+       * @param attributes a set containing names of attributes
        * @return true in case of success and false in case of failure
        */
-      virtual bool deleteAttributes(const QgsAttributeIds & attributes);
+      virtual bool deleteAttributes(const QgsAttributeIds& attributes);
 
       /**
        * Changes attribute values of existing features.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2878,27 +2878,36 @@ void QgsVectorLayer::setCoordinateSystem()
 
 }
 
-bool QgsVectorLayer::commitAttributeChanges(const QgsAttributeIds& deleted,
+bool QgsVectorLayer::commitAttributeChanges(const QgsDeletedAttributesSet& deleted,
                             const QgsNewAttributesMap& added,
                             const QgsChangedAttributesMap& changed)
 {
   bool returnvalue=true;
 
   if(mDataProvider)
   {
+
+    QgsAttributeIds attIds;
+    QgsDeletedAttributesSet::const_iterator att_it = deleted.constBegin();
+
+    for(; att_it != deleted.constEnd(); ++att_it)
+      {
+	attIds.insert(mDataProvider->indexFromFieldName(*att_it));
+      }
+
     if(mDataProvider->capabilities()&QgsVectorDataProvider::DeleteAttributes)
     {
       //delete attributes in all not commited features
       for (QgsFeatureList::iterator iter = mAddedFeatures.begin(); iter != mAddedFeatures.end(); ++iter)
       {
-        for (QgsAttributeIds::const_iterator it = deleted.begin(); it != deleted.end(); ++it)
+        for (QgsAttributeIds::const_iterator it = attIds.begin(); it != attIds.end(); ++it)
         {
           (*iter).deleteAttribute(*it);
         }
       }
 
       //and then in the provider
-      if(!mDataProvider->deleteAttributes(deleted))
+      if(!mDataProvider->deleteAttributes(attIds))
       {
         returnvalue=false;
       }
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -56,6 +56,8 @@ typedef QSet<int> QgsAttributeIds;
 // key = attribute name, value = attribute type
 typedef QMap<QString, QString> QgsNewAttributesMap;
 
+typedef QSet<QString> QgsDeletedAttributesSet;
+
 typedef QMap<int, QgsField> QgsFieldMap;
 
 
@@ -314,7 +316,7 @@ existing rings, 5 no feature found where ring can be inserted*/
                       of attribute values to change
 
    */
-  bool commitAttributeChanges(const QgsAttributeIds& deleted,
+  bool commitAttributeChanges(const QgsDeletedAttributesSet& deleted,
                               const QgsNewAttributesMap& added,
                               const QgsChangedAttributesMap& changed);
 
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1768,17 +1768,21 @@ bool QgsPostgresProvider::addAttributes(const QgsNewAttributesMap & name)
   return returnvalue;
 }
 
-bool QgsPostgresProvider::deleteAttributes(const QgsAttributeIds& name)
+bool QgsPostgresProvider::deleteAttributes(const QgsAttributeIds& ids)
 {
   bool returnvalue=true;
   PQexec(connection,"BEGIN");
-  for(QgsAttributeIds::const_iterator iter=name.begin();iter!=name.end();++iter)
+
+  for(QgsAttributeIds::const_iterator iter=ids.begin();iter != ids.end();++iter)
   {
-    QString column = attributeFields[*iter].name();
+    QgsFieldMap::const_iterator field_it = attributeFields.find(*iter);
+    if(field_it == attributeFields.constEnd())
+      {
+	continue;
+      }
+    QString column = field_it->name();
     QString sql="ALTER TABLE "+mSchemaTableName+" DROP COLUMN "+column;
     
-    QgsDebugMsg(sql);
-    
     //send sql statement and do error handling
     PGresult* result=PQexec(connection, (const char *)(sql.utf8()));
     if(result==0)

Original file line number	Diff line number	Diff line change
`@@ -356,9 +356,7 @@ void QgsAttributeTable::deleteAttribute(const QString& name)`
`356`	`356`	`}`
`357`	`357`	`else`
`358`	`358`	`{`
`359`		`- QgsDebugMsg("QgsAttributeTable: deleteAttribute " + name);`
`360`		`-`
`361`		`- // TODO: [MD] mDeletedAttributes.insert(name);`
	`359`	`+ mDeletedAttributes.insert(name);`
`362`	`360`	`removeAttrColumn(name);`
`363`	`361`	`}`
`364`	`362`	`mEdited=true;`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ bool QgsVectorDataProvider::addAttributes(const QgsNewAttributesMap & attributes`
`82`	`82`	`return false;`
`83`	`83`	`}`
`84`	`84`
`85`		`-bool QgsVectorDataProvider::deleteAttributes(const QgsAttributeIds & attributes)`
	`85`	`+bool QgsVectorDataProvider::deleteAttributes(const QgsAttributeIds& attributes)`
`86`	`86`	`{`
`87`	`87`	`return false;`
`88`	`88`	`}`
`@@ -220,15 +220,13 @@ QString QgsVectorDataProvider::capabilitiesString() const`
`220`	`220`	`int QgsVectorDataProvider::indexFromFieldName(const QString& fieldName) const`
`221`	`221`	`{`
`222`	`222`	`const QgsFieldMap& theFields = fields();`
`223`		`- int counter = 0;`
`224`	`223`
`225`	`224`	`for (QgsFieldMap::const_iterator it = theFields.begin(); it != theFields.end(); ++it)`
`226`	`225`	`{`
`227`	`226`	`if(it->name() == fieldName)`
`228`	`227`	`{`
`229`		`- return counter;`
	`228`	`+ return it.key();`
`230`	`229`	`}`
`231`		`- ++counter;`
`232`	`230`	`}`
`233`	`231`	`return -1;`
`234`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2878,27 +2878,36 @@ void QgsVectorLayer::setCoordinateSystem()`
`2878`	`2878`
`2879`	`2879`	`}`
`2880`	`2880`
`2881`		`-bool QgsVectorLayer::commitAttributeChanges(const QgsAttributeIds& deleted,`
	`2881`	`+bool QgsVectorLayer::commitAttributeChanges(const QgsDeletedAttributesSet& deleted,`
`2882`	`2882`	`const QgsNewAttributesMap& added,`
`2883`	`2883`	`const QgsChangedAttributesMap& changed)`
`2884`	`2884`	`{`
`2885`	`2885`	`bool returnvalue=true;`
`2886`	`2886`
`2887`	`2887`	`if(mDataProvider)`
`2888`	`2888`	`{`
	`2889`	`+`
	`2890`	`+ QgsAttributeIds attIds;`
	`2891`	`+ QgsDeletedAttributesSet::const_iterator att_it = deleted.constBegin();`
	`2892`	`+`
	`2893`	`+ for(; att_it != deleted.constEnd(); ++att_it)`
	`2894`	`+ {`
	`2895`	`+ attIds.insert(mDataProvider->indexFromFieldName(*att_it));`
	`2896`	`+ }`
	`2897`	`+`
`2889`	`2898`	`if(mDataProvider->capabilities()&QgsVectorDataProvider::DeleteAttributes)`
`2890`	`2899`	`{`
`2891`	`2900`	`//delete attributes in all not commited features`
`2892`	`2901`	`for (QgsFeatureList::iterator iter = mAddedFeatures.begin(); iter != mAddedFeatures.end(); ++iter)`
`2893`	`2902`	`{`
`2894`		`- for (QgsAttributeIds::const_iterator it = deleted.begin(); it != deleted.end(); ++it)`
	`2903`	`+ for (QgsAttributeIds::const_iterator it = attIds.begin(); it != attIds.end(); ++it)`
`2895`	`2904`	`{`
`2896`	`2905`	`(iter).deleteAttribute(it);`
`2897`	`2906`	`}`
`2898`	`2907`	`}`
`2899`	`2908`
`2900`	`2909`	`//and then in the provider`
`2901`		`- if(!mDataProvider->deleteAttributes(deleted))`
	`2910`	`+ if(!mDataProvider->deleteAttributes(attIds))`
`2902`	`2911`	`{`
`2903`	`2912`	`returnvalue=false;`
`2904`	`2913`	`}`