Tried to fix problems with allAttributeList() in postgres provider

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6900 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 20, 2007 · 3d2c245 · 3d2c245
1 parent b2c945b
commit 3d2c245
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -251,7 +251,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
       /**
        * Return list of indexes to fetch all attributes in getNextFeature()
        */
-      QgsAttributeList allAttributesList();
+      virtual QgsAttributeList allAttributesList();
 
       /**Returns the names of the numerical types*/
       const QSet<QString>& supportedNativeTypes() const;

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -242,8 +242,6 @@ QgsPostgresProvider::QgsPostgresProvider(QString const & uri)
     QgsDebugMsg("Field: " + attnum + " maps to " + QString::number(i) + " " + fieldName + ", " 
       + fieldTypeName + " (" + QString::number(fldtyp) + "),  " + fieldSize + ", " + QString::number(fieldModifier));
 
-    attributeFieldsIdMap[attnum.toInt()] = i;
-
     if(fieldName!=geometryColumn)
     {
       QVariant::Type fieldType;
@@ -2123,6 +2121,16 @@ bool QgsPostgresProvider::changeGeometryValues(QgsGeometryMap & geometry_map)
   return returnvalue;
 }
 
+QgsAttributeList QgsPostgresProvider::allAttributesList()
+{
+	QgsAttributeList attributes;
+	for(QgsFieldMap::iterator it = attributeFields.begin(); it != attributeFields.end(); ++it)
+	{
+		attributes.push_back(it.key());
+	}
+	return attributes;
+}
+
 
 int QgsPostgresProvider::capabilities() const
 {

diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -195,6 +195,8 @@ class QgsPostgresProvider:public QgsVectorDataProvider
     /**Returns true if layer is valid
     */
     bool isValid();
+
+    QgsAttributeList allAttributesList();
 
     //! get postgis version string
     QString postgisVersion(PGconn *);
@@ -328,7 +330,6 @@ class QgsPostgresProvider:public QgsVectorDataProvider
 
     std::vector < QgsFeature > features;
     QgsFieldMap attributeFields;
-    std::map < int, int > attributeFieldsIdMap;
     QString mDataComment;
 
     //! Data source URI struct for this layer