Exception for constraint expression

qgis · Oct 8, 2024 · e67e777 · e67e777
1 parent 6ab87a1
commit e67e777
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/python/PyQt6/core/auto_generated/qgsfieldconstraints.sip.in b/python/PyQt6/core/auto_generated/qgsfieldconstraints.sip.in
@@ -72,7 +72,8 @@ is not present on this field.
     ConstraintStrength constraintStrength( Constraint constraint ) const;
 %Docstring
 Returns the strength of a field constraint, or ConstraintStrengthNotSet if the constraint
-is not present on this field.
+is not present on this field. If the strength is not set returns ConstraintStrengthNotSet
+for anything but ConstraintExpression when returns ConstraintStrengthHard.
 
 .. seealso:: :py:func:`constraints`
 

diff --git a/python/core/auto_generated/qgsfieldconstraints.sip.in b/python/core/auto_generated/qgsfieldconstraints.sip.in
@@ -72,7 +72,8 @@ is not present on this field.
     ConstraintStrength constraintStrength( Constraint constraint ) const;
 %Docstring
 Returns the strength of a field constraint, or ConstraintStrengthNotSet if the constraint
-is not present on this field.
+is not present on this field. If the strength is not set returns ConstraintStrengthNotSet
+for anything but ConstraintExpression when returns ConstraintStrengthHard.
 
 .. seealso:: :py:func:`constraints`
 

diff --git a/src/core/qgsfieldconstraints.cpp b/src/core/qgsfieldconstraints.cpp
@@ -29,8 +29,8 @@ QgsFieldConstraints::ConstraintStrength QgsFieldConstraints::constraintStrength(
   if ( !( mConstraints & constraint ) )
     return ConstraintStrengthNotSet;
 
-  // defaults to not set
-  return mConstraintStrengths.value( constraint, ConstraintStrengthNotSet );
+  // defaults to not set for all but expressions (which does not use strength)
+  return mConstraintStrengths.value( constraint, constraint == ConstraintExpression ? ConstraintStrengthHard : ConstraintStrengthNotSet );
 }
 
 void QgsFieldConstraints::setConstraintStrength( QgsFieldConstraints::Constraint constraint, QgsFieldConstraints::ConstraintStrength strength )

diff --git a/src/core/qgsfieldconstraints.h b/src/core/qgsfieldconstraints.h
@@ -89,7 +89,8 @@ class CORE_EXPORT QgsFieldConstraints
 
     /**
      * Returns the strength of a field constraint, or ConstraintStrengthNotSet if the constraint
-     * is not present on this field.
+     * is not present on this field. If the strength is not set returns ConstraintStrengthNotSet
+     * for anything but ConstraintExpression when returns ConstraintStrengthHard.
      * \see constraints()
      * \see setConstraintStrength()
      */