case-sensitivity of vector layer field (fixes #13032)

jef-n · jef-n · commit 945187c8f255 · 2015-11-26T20:32:29.000+01:00
* fieldNameIndex: resort to case-insensitive lookup only if case-sensitive lookup has no match * file writer: fix handling of fields that only differ by case (backported from commit 8e2b791)
diff --git a/python/core/qgsfield.sip b/python/core/qgsfield.sip
@@ -14,7 +14,7 @@ class QgsField
 #include <qgsfield.h>
 %End
 
-public:
+  public:
     /** Constructor. Constructs a new QgsField object.
      * @param name Field name
      * @param type Field variant type, currently supported: String / Int / Double
@@ -171,6 +171,14 @@ public:
 }; // class QgsField
 
 
+/**
+ \ingroup core
+ Container of fields for a vector layer.
+
+ In addition to storing a list of QgsField instances, it also:
+ - allows quick lookups of field names to index in the list
+ - keeps track of where the field definition comes from (vector data provider, joined layer or newly added from an editing operation)
+ */
 
 class QgsFields
 {
@@ -192,6 +200,8 @@ class QgsFields
     void clear();
     //! Append a field. The field must have unique name, otherwise it is rejected (returns false)
     bool append( const QgsField& field, FieldOrigin origin = OriginProvider, int originIndex = -1 );
+    //! Append an expression field. The field must have unique name, otherwise it is rejected (returns false)
+    bool appendExpressionField( const QgsField& field, int originIndex );
     //! Remove a field with the given index
     void remove( int fieldIdx );
     //! Extend with fields from another QgsFields container
@@ -240,8 +250,8 @@ class QgsFields
     //! Look up field's index from name. Returns -1 on error
     int indexFromName( const QString& name ) const;
 
-    //! Look up field's index from name - case insensitive
-    //! TODO: sort out case sensitive (indexFromName()) vs insensitive (fieldNameIndex()) calls
+    //! Look up field's index from name
+    //! also looks up case-insensitive if there is no match otherwise
     //! @note added in 2.4
     int fieldNameIndex( const QString& fieldName ) const;
 
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -262,13 +262,18 @@ QList<QgsField> QgsFields::toList() const
 
 int QgsFields::fieldNameIndex( const QString& fieldName ) const
 {
+  for ( int idx = 0; idx < count(); ++idx )
+  {
+    if ( mFields[idx].field.name() == fieldName )
+      return idx;
+  }
+
   for ( int idx = 0; idx < count(); ++idx )
   {
     if ( QString::compare( mFields[idx].field.name(), fieldName, Qt::CaseInsensitive ) == 0 )
-    {
       return idx;
-    }
   }
+
   return -1;
 }
 
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
@@ -238,8 +238,8 @@ class CORE_EXPORT QgsFields
     //! Look up field's index from name. Returns -1 on error
     int indexFromName( const QString& name ) const { return mNameToIndex.value( name, -1 ); }
 
-    //! Look up field's index from name - case insensitive
-    //! TODO: sort out case sensitive (indexFromName()) vs insensitive (fieldNameIndex()) calls
+    //! Look up field's index from name
+    //! also looks up case-insensitive if there is no match otherwise
     //! @note added in 2.4
     int fieldNameIndex( const QString& fieldName ) const;
 
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -337,6 +337,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
 
   mFields = fields;
   mAttrIdxToOgrIdx.clear();
+  QSet<int> existingIdxs;
 
   for ( int fldIdx = 0; fldIdx < fields.count(); ++fldIdx )
   {
@@ -445,7 +446,8 @@ QgsVectorFileWriter::QgsVectorFileWriter(
     OGR_Fld_Destroy( fld );
 
     int ogrIdx = OGR_FD_GetFieldIndex( defn, mCodec->fromUnicode( name ) );
-    if ( ogrIdx < 0 )
+    QgsDebugMsg( QString( "returned field index for %1: %2" ).arg( name ).arg( ogrIdx ) );
+    if ( ogrIdx < 0 || existingIdxs.contains( ogrIdx ) )
     {
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM < 1700
       // if we didn't find our new column, assume it's name was truncated and
@@ -478,6 +480,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
       }
     }
 
+    existingIdxs.insert( ogrIdx );
     mAttrIdxToOgrIdx.insert( fldIdx, ogrIdx );
   }
 
@@ -1386,7 +1389,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
 
   layerOptions.insert( "LAUNDER", new BoolOption(
                          QObject::tr( "Controls whether layer and field names will be laundered for easier use "
-                                      "in SQLite. Laundered names will be convered to lower case and some special "
+                                      "in SQLite. Laundered names will be converted to lower case and some special "
                                       "characters(' - #) will be changed to underscores." ),
                          true  // Default value
                        ) );
@@ -2594,7 +2597,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels
         if ( !styleString.isEmpty() )
         {
           OGR_F_SetStyleString( ogrFeature, styleString.toLocal8Bit().data() );
-          if ( ! writeFeature( mLayer, ogrFeature ) )
+          if ( !writeFeature( mLayer, ogrFeature ) )
           {
             ++nErrors;
           }

Original file line number	Diff line number	Diff line change
`@@ -262,13 +262,18 @@ QList<QgsField> QgsFields::toList() const`
`262`	`262`
`263`	`263`	`int QgsFields::fieldNameIndex( const QString& fieldName ) const`
`264`	`264`	`{`
	`265`	`+ for ( int idx = 0; idx < count(); ++idx )`
	`266`	`+ {`
	`267`	`+ if ( mFields[idx].field.name() == fieldName )`
	`268`	`+ return idx;`
	`269`	`+ }`
	`270`	`+`
`265`	`271`	`for ( int idx = 0; idx < count(); ++idx )`
`266`	`272`	`{`
`267`	`273`	`if ( QString::compare( mFields[idx].field.name(), fieldName, Qt::CaseInsensitive ) == 0 )`
`268`		`- {`
`269`	`274`	`return idx;`
`270`		`- }`
`271`	`275`	`}`
	`276`	`+`
`272`	`277`	`return -1;`
`273`	`278`	`}`
`274`	`279`
Original file line number	Diff line number	Diff line change
`@@ -337,6 +337,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(`
`337`	`337`
`338`	`338`	`mFields = fields;`
`339`	`339`	`mAttrIdxToOgrIdx.clear();`
	`340`	`+ QSet<int> existingIdxs;`
`340`	`341`
`341`	`342`	`for ( int fldIdx = 0; fldIdx < fields.count(); ++fldIdx )`
`342`	`343`	`{`
`@@ -445,7 +446,8 @@ QgsVectorFileWriter::QgsVectorFileWriter(`
`445`	`446`	`OGR_Fld_Destroy( fld );`
`446`	`447`
`447`	`448`	`int ogrIdx = OGR_FD_GetFieldIndex( defn, mCodec->fromUnicode( name ) );`
`448`		`- if ( ogrIdx < 0 )`
	`449`	`+ QgsDebugMsg( QString( "returned field index for %1: %2" ).arg( name ).arg( ogrIdx ) );`
	`450`	`+ if ( ogrIdx < 0 \|\| existingIdxs.contains( ogrIdx ) )`
`449`	`451`	`{`
`450`	`452`	`#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM < 1700`
`451`	`453`	`// if we didn't find our new column, assume it's name was truncated and`
`@@ -478,6 +480,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(`
`478`	`480`	`}`
`479`	`481`	`}`
`480`	`482`
	`483`	`+ existingIdxs.insert( ogrIdx );`
`481`	`484`	`mAttrIdxToOgrIdx.insert( fldIdx, ogrIdx );`
`482`	`485`	`}`
`483`	`486`
`@@ -1386,7 +1389,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()`
`1386`	`1389`
`1387`	`1390`	`layerOptions.insert( "LAUNDER", new BoolOption(`
`1388`	`1391`	`QObject::tr( "Controls whether layer and field names will be laundered for easier use "`
`1389`		`- "in SQLite. Laundered names will be convered to lower case and some special "`
	`1392`	`+ "in SQLite. Laundered names will be converted to lower case and some special "`
`1390`	`1393`	`"characters(' - #) will be changed to underscores." ),`
`1391`	`1394`	`true // Default value`
`1392`	`1395`	`) );`
`@@ -2594,7 +2597,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels`
`2594`	`2597`	`if ( !styleString.isEmpty() )`
`2595`	`2598`	`{`
`2596`	`2599`	`OGR_F_SetStyleString( ogrFeature, styleString.toLocal8Bit().data() );`
`2597`		`- if ( ! writeFeature( mLayer, ogrFeature ) )`
	`2600`	`+ if ( !writeFeature( mLayer, ogrFeature ) )`
`2598`	`2601`	`{`
`2599`	`2602`	`++nErrors;`
`2600`	`2603`	`}`