proper fix of online merge conflit

jgrocha · jgrocha · commit 1d0fa9f6e539 · 2020-02-18T11:16:18.000Z
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -4928,7 +4928,7 @@ bool QgsPostgresProviderMetadata::saveStyle( const QString &uri, const QString &
                        .arg( wkbTypeString )
                        .arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) );
 
-  res = conn->PQexec( checkQuery );
+  QgsPostgresResult res( conn->PQexec( checkQuery ) );
   if ( res.PQntuples() > 0 )
   {
     if ( QMessageBox::question( nullptr, QObject::tr( "Save style in database" ),

Original file line number	Diff line number	Diff line change
`@@ -4928,7 +4928,7 @@ bool QgsPostgresProviderMetadata::saveStyle( const QString &uri, const QString &`
`4928`	`4928`	`.arg( wkbTypeString )`
`4929`	`4929`	`.arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) );`
`4930`	`4930`
`4931`		`- res = conn->PQexec( checkQuery );`
	`4931`	`+ QgsPostgresResult res( conn->PQexec( checkQuery ) );`
`4932`	`4932`	`if ( res.PQntuples() > 0 )`
`4933`	`4933`	`{`
`4934`	`4934`	`if ( QMessageBox::question( nullptr, QObject::tr( "Save style in database" ),`