fix crash in postgres layer creation (followup 3470b1d; fixes #10014)

jef-n · jef-n · commit f4545d9dec81 · 2014-05-31T16:31:08.000+02:00
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2780,7 +2780,7 @@ bool QgsPostgresProvider::convertField( QgsField &field , const QMap<QString, QV
 {
   //determine field type to use for strings
   QString stringFieldType = "varchar";
-  if ( options->contains( "dropStringConstraints" ) && options->value( "dropStringConstraints" ).toBool() )
+  if ( options && options->value( "dropStringConstraints", false ).toBool() )
   {
     //drop string length constraints by using PostgreSQL text type for strings
     stringFieldType = "text";
@@ -2970,7 +2970,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
         throw PGException( result );
     }
 
-    if ( options->contains( "lowercaseFieldNames" ) && options->value( "lowercaseFieldNames" ).toBool() )
+    if ( options && options->value( "lowercaseFieldNames", false ).toBool() )
     {
       //convert primary key name to lowercase
       //this must happen after determining the field type of the primary key
@@ -3065,7 +3065,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(
         continue;
       }
 
-      if ( options->contains( "lowercaseFieldNames" ) && options->value( "lowercaseFieldNames" ).toBool() )
+      if ( options && options->value( "lowercaseFieldNames", false ).toBool() )
       {
         //convert field name to lowercase
         fld.setName( fld.name().toLower() );

Original file line number	Diff line number	Diff line change
`@@ -2780,7 +2780,7 @@ bool QgsPostgresProvider::convertField( QgsField &field , const QMap<QString, QV`
`2780`	`2780`	`{`
`2781`	`2781`	`//determine field type to use for strings`
`2782`	`2782`	`QString stringFieldType = "varchar";`
`2783`		`- if ( options->contains( "dropStringConstraints" ) && options->value( "dropStringConstraints" ).toBool() )`
	`2783`	`+ if ( options && options->value( "dropStringConstraints", false ).toBool() )`
`2784`	`2784`	`{`
`2785`	`2785`	`//drop string length constraints by using PostgreSQL text type for strings`
`2786`	`2786`	`stringFieldType = "text";`
`@@ -2970,7 +2970,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(`
`2970`	`2970`	`throw PGException( result );`
`2971`	`2971`	`}`
`2972`	`2972`
`2973`		`- if ( options->contains( "lowercaseFieldNames" ) && options->value( "lowercaseFieldNames" ).toBool() )`
	`2973`	`+ if ( options && options->value( "lowercaseFieldNames", false ).toBool() )`
`2974`	`2974`	`{`
`2975`	`2975`	`//convert primary key name to lowercase`
`2976`	`2976`	`//this must happen after determining the field type of the primary key`
`@@ -3065,7 +3065,7 @@ QgsVectorLayerImport::ImportError QgsPostgresProvider::createEmptyLayer(`
`3065`	`3065`	`continue;`
`3066`	`3066`	`}`
`3067`	`3067`
`3068`		`- if ( options->contains( "lowercaseFieldNames" ) && options->value( "lowercaseFieldNames" ).toBool() )`
	`3068`	`+ if ( options && options->value( "lowercaseFieldNames", false ).toBool() )`
`3069`	`3069`	`{`
`3070`	`3070`	`//convert field name to lowercase`
`3071`	`3071`	`fld.setName( fld.name().toLower() );`