Merge remote-tracking branch 'origin/devel' into devel

Former-commit-id: ad843ff9

plugins/org.jkiss.dbeaver.ext.mockdata/src/org/jkiss/dbeaver/ext/mockdata/generator/StringTextGenerator.java

@@ -49,6 +49,9 @@ public class StringTextGenerator extends AbstractStringValueGenerator {
         if (min != null) {
             this.minLength = min;
         }
+        if (minLength > templateString.length()) {
+            minLength = templateString.length();
+        }
 
         Integer max = (Integer) properties.get("maxLength"); //$NON-NLS-1$
         if (max != null) {
@@ -61,6 +64,9 @@ public class StringTextGenerator extends AbstractStringValueGenerator {
         if (maxLength > templateString.length()) { // TODO check templateString shouldn't be empty
             maxLength = templateString.length();
         }
+        if (minLength > maxLength) {
+            maxLength = minLength;
+        }
     }
 
     @Override