QgsVectorFilewriter skip default null options

m-kuhn · m-kuhn · commit 93bc31d033d1 · 2017-09-06T11:06:27.000+02:00
Don't specify dataset options which have null default values. Setting
these as empty strings might introduce a different behavior than
expected.

For example not creating an xsd companion file for GML.
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -1032,7 +1032,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
                                         "Note that the schema file isn't actually accessed by OGR, so it "
                                         "is up to the user to ensure it will match the schema of the OGR "
                                         "produced GML data file." ),
-                           QLatin1String( "" )  // Default value
+                           QString()  // Default value
                          ) );
 
   datasetOptions.insert( QStringLiteral( "XSISCHEMA" ), new SetOption(
@@ -3225,7 +3225,7 @@ QStringList QgsVectorFileWriter::concatenateOptions( const QMap<QString, QgsVect
       case QgsVectorFileWriter::String:
       {
         QgsVectorFileWriter::StringOption *opt = dynamic_cast<QgsVectorFileWriter::StringOption *>( option );
-        if ( opt )
+        if ( opt && !opt->defaultValue.isNull() )
         {
           list.append( QStringLiteral( "%1=%2" ).arg( it.key(), opt->defaultValue ) );
         }

Original file line number	Diff line number	Diff line change
`@@ -1032,7 +1032,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()`
`1032`	`1032`	`"Note that the schema file isn't actually accessed by OGR, so it "`
`1033`	`1033`	`"is up to the user to ensure it will match the schema of the OGR "`
`1034`	`1034`	`"produced GML data file." ),`
`1035`		`- QLatin1String( "" ) // Default value`
	`1035`	`+ QString() // Default value`
`1036`	`1036`	`) );`
`1037`	`1037`
`1038`	`1038`	`datasetOptions.insert( QStringLiteral( "XSISCHEMA" ), new SetOption(`
`@@ -3225,7 +3225,7 @@ QStringList QgsVectorFileWriter::concatenateOptions( const QMap<QString, QgsVect`
`3225`	`3225`	`case QgsVectorFileWriter::String:`
`3226`	`3226`	`{`
`3227`	`3227`	`QgsVectorFileWriter::StringOption opt = dynamic_cast<QgsVectorFileWriter::StringOption >( option );`
`3228`		`- if ( opt )`
	`3228`	`+ if ( opt && !opt->defaultValue.isNull() )`
`3229`	`3229`	`{`
`3230`	`3230`	`list.append( QStringLiteral( "%1=%2" ).arg( it.key(), opt->defaultValue ) );`
`3231`	`3231`	`}`