Merge pull request #5568 from m-kuhn/postgresDefaultValues

m-kuhn · web-flow · commit 78622b481613 · 2017-11-09T01:46:30.000+01:00
[postgres] Fix default value check if evaluated server side
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1846,7 +1846,7 @@ bool QgsPostgresProvider::skipConstraintCheck( int fieldIndex, QgsFieldConstrain
 {
   if ( providerProperty( EvaluateDefaultValues, false ).toBool() )
   {
-    return mDefaultValues.contains( fieldIndex );
+    return !mDefaultValues.value( fieldIndex ).isEmpty();
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -1846,7 +1846,7 @@ bool QgsPostgresProvider::skipConstraintCheck( int fieldIndex, QgsFieldConstrain`
`1846`	`1846`	`{`
`1847`	`1847`	`if ( providerProperty( EvaluateDefaultValues, false ).toBool() )`
`1848`	`1848`	`{`
`1849`		`- return mDefaultValues.contains( fieldIndex );`
	`1849`	`+ return !mDefaultValues.value( fieldIndex ).isEmpty();`
`1850`	`1850`	`}`
`1851`	`1851`	`else`
`1852`	`1852`	`{`