Support field type conversion for Multi Choice fields

api/src/org/labkey/api/data/CompareType.java

@@ -827,6 +827,39 @@ protected Collection getCollectionParam(Object value)
      *             <xsd:enumeration value="arrayisempty"/>
      *             <xsd:enumeration value="arrayisnotempty"/>
      */
+
+
+    public static final CompareType ARRAY_IS_EMPTY = new CompareType("Is Empty", "arrayisempty", "ARRAYISEMPTY", false, null, OperatorType.ARRAYISEMPTY)
+    {
+        @Override
+        public ArrayIsEmptyClause createFilterClause(@NotNull FieldKey fieldKey, Object value)
+        {
+            return new ArrayIsEmptyClause(fieldKey);
+        }
+
+        @Override
+        public boolean meetsCriteria(ColumnRenderProperties col, Object value, Object[] filterValues)
+        {
+            throw new UnsupportedOperationException("Conditional formatting not yet supported for Multi Choices");
+        }
+    };
+
+
+    public static final CompareType ARRAY_IS_NOT_EMPTY = new CompareType("Is Not Empty", "arrayisnotempty", "ARRAYISNOTEMPTY", false, null, OperatorType.ARRAYISNOTEMPTY)
+    {
+        @Override
+        public ArrayIsEmptyClause createFilterClause(@NotNull FieldKey fieldKey, Object value)
+        {
+            return new ArrayIsNotEmptyClause(fieldKey);
+        }
+
+        @Override
+        public boolean meetsCriteria(ColumnRenderProperties col, Object value, Object[] filterValues)
+        {
+            throw new UnsupportedOperationException("Conditional formatting not yet supported for Multi Choices");
+        }
+    };
+
     public static final CompareType ARRAY_CONTAINS_ALL = new CompareType("Contains All", "arraycontainsall", "ARRAYCONTAINSALL", true, null, OperatorType.ARRAYCONTAINSALL)
     {
         @Override
@@ -934,7 +967,7 @@ public String getValueSeparator()
 
     public static abstract class ArrayClause extends SimpleFilter.MultiValuedFilterClause
     {
-        public static final String ARRAY_VALUE_SEPARATOR = ",";
+        public static final String ARRAY_VALUE_SEPARATOR = ";";
 
         public ArrayClause(@NotNull FieldKey fieldKey, CompareType comparison, Collection<?> params, boolean negated)
         {
@@ -958,7 +991,7 @@ public SQLFragment[] getParamSQLFragments(SqlDialect dialect)
             }
 
             for (int i = 0; i < params.length; i++)
-                fragments[i] = new SQLFragment().append(escapeLabKeySqlValue(params[i], type));
+                fragments[i] = SQLFragment.unsafe(escapeLabKeySqlValue(params[i], type));
 
             return fragments;
         }
@@ -981,6 +1014,68 @@ public Pair<SQLFragment, SQLFragment> getSqlFragments(Map<FieldKey, ? extends Co
 
     }
 
+    private static class ArrayIsEmptyClause extends ArrayClause
+    {
+        public ArrayIsEmptyClause(@NotNull FieldKey fieldKey, CompareType comparison, boolean negated)
+        {
+            super(fieldKey, comparison, null, negated);
+        }
+
+        public ArrayIsEmptyClause(@NotNull FieldKey fieldKey)
+        {
+            this(fieldKey, CompareType.ARRAY_IS_EMPTY, false);
+        }
+
+        @Override
+        public SQLFragment toSQLFragment(Map<FieldKey, ? extends ColumnInfo> columnMap, SqlDialect dialect)
+        {
+            ColumnInfo colInfo = columnMap != null ? columnMap.get(_fieldKey) : null;
+            var alias = SimpleFilter.getAliasForColumnFilter(dialect, colInfo, _fieldKey);
+
+            SQLFragment columnFragment = new SQLFragment().appendIdentifier(alias);
+
+            SQLFragment sql = dialect.array_is_empty(columnFragment);
+            if (!_negated)
+                return sql;
+            return new SQLFragment(" NOT (").append(sql).append(")");
+        }
+
+        @Override
+        public String getLabKeySQLWhereClause(Map<FieldKey, ? extends ColumnInfo> columnMap)
+        {
+            return "array_is_empty(" + getLabKeySQLColName(_fieldKey) + ")";
+        }
+
+        @Override
+        public void appendFilterText(StringBuilder sb, ColumnNameFormatter formatter)
+        {
+            sb.append("is empty");
+        }
+
+    }
+
+    private static class ArrayIsNotEmptyClause extends ArrayIsEmptyClause
+    {
+
+        public ArrayIsNotEmptyClause(@NotNull FieldKey fieldKey)
+        {
+            super(fieldKey, CompareType.ARRAY_IS_NOT_EMPTY, true);
+        }
+
+        @Override
+        public String getLabKeySQLWhereClause(Map<FieldKey, ? extends ColumnInfo> columnMap)
+        {
+            return "NOT array_is_empty(" + getLabKeySQLColName(_fieldKey) + ")";
+        }
+
+        @Override
+        public void appendFilterText(StringBuilder sb, ColumnNameFormatter formatter)
+        {
+            sb.append("is not empty");
+        }
+
+    }
+
     private static class ArrayContainsAllClause extends ArrayClause
     {
 

api/src/org/labkey/api/data/MultiValuedRenderContext.java

@@ -19,6 +19,7 @@
 import org.apache.commons.collections4.iterators.ArrayIterator;
 import org.junit.Assert;
 import org.junit.Test;
+import org.labkey.api.exp.PropertyType;
 import org.labkey.api.query.FieldKey;
 
 import java.util.HashMap;
@@ -113,6 +114,13 @@ public Object get(Object key)
             if (getFieldMap() != null)
             {
                 ColumnInfo columnInfo = getFieldMap().get(key);
+                if (columnInfo != null && columnInfo.getPropertyType() == PropertyType.MULTI_CHOICE && value instanceof String strVal)
+                {
+                    // Multi-choice values array is converted to string: "{value1,value2,...}", so strip off the braces before converting
+                    if (strVal.startsWith("{") && strVal.endsWith("}"))
+                        return ConvertUtils.convert(strVal.substring(1, strVal.length() - 1), columnInfo.getJavaClass());
+                    // TODO: return columnInfo.convert(strVal.substring(1, strVal.length() - 1));
+                }
                 // The value was concatenated with others, so it's become a string.
                 // Do conversion to switch it back to the expected type.
                 if (value != null && columnInfo != null && !columnInfo.getJavaClass().isInstance(value))

api/src/org/labkey/api/data/SimpleFilter.java

@@ -620,7 +620,7 @@ public static abstract class MultiValuedFilterClause extends CompareType.Abstrac
         public MultiValuedFilterClause(@NotNull FieldKey fieldKey, CompareType comparison, Collection<?> params, boolean negated)
         {
             super(fieldKey);
-            params = new ArrayList<>(params); // possibly immutable
+            params = params == null ? new ArrayList<>() : new ArrayList<>(params); // possibly immutable
             if (params.contains(null)) //params.size() == 0 ||
             {
                 _includeNull = true;

api/src/org/labkey/api/data/TableChange.java

@@ -20,6 +20,7 @@
 import org.labkey.api.data.PropertyStorageSpec.Index;
 import org.labkey.api.data.TableInfo.IndexDefinition;
 import org.labkey.api.exp.PropertyDescriptor;
+import org.labkey.api.exp.PropertyType;
 import org.labkey.api.exp.property.Domain;
 import org.labkey.api.exp.property.DomainKind;
 import org.labkey.api.util.logging.LogHelper;
@@ -58,6 +59,7 @@ public class TableChange
     private Collection<Constraint> _constraints;
     private Set<String> _indicesToBeDroppedByName;
     private IndexSizeMode _sizeMode = IndexSizeMode.Auto;
+    private Map<String, PropertyType> _oldPropTypes;
 
     /** In most cases, domain knows the storage table name **/
     public TableChange(Domain domain, ChangeType changeType)
@@ -329,6 +331,11 @@ public void setForeignKeys(Collection<PropertyStorageSpec.ForeignKey> foreignKey
         _foreignKeys = foreignKeys;
     }
 
+    public Map<String, PropertyType> getOldPropTypes()
+    {
+        return _oldPropTypes;
+    }
+
     public final List<PropertyStorageSpec> toSpecs(Collection<String> columnNames)
     {
         final Domain domain = _domain;
@@ -349,6 +356,11 @@ public final List<PropertyStorageSpec> toSpecs(Collection<String> columnNames)
                 .collect(Collectors.toList());
     }
 
+    public void setOldPropertyTypes(Map<String, PropertyType> oldPropTypes)
+    {
+        _oldPropTypes = oldPropTypes;
+    }
+
     public enum ChangeType
     {
         CreateTable,

api/src/org/labkey/api/data/dialect/SqlDialect.java

@@ -2200,6 +2200,12 @@ public SQLFragment array_construct(SQLFragment[] elements)
         throw new UnsupportedOperationException(getClass().getSimpleName() + " does not implement");
     }
 
+    public SQLFragment array_is_empty(SQLFragment a)
+    {
+        assert !supportsArrays();
+        throw new UnsupportedOperationException(getClass().getSimpleName() + " does not implement");
+    }
+
     // element a is in array b
     public SQLFragment element_in_array(SQLFragment a, SQLFragment b)
     {

api/src/org/labkey/api/exp/property/DomainUtil.java

@@ -435,8 +435,6 @@ public static boolean allowMultiChoice(DomainKind<?> kind)
     {
         if (!kind.allowMultiChoiceProperties())
             return false;
-        if (!OptionalFeatureService.get().isFeatureEnabled(AppProps.MULTI_VALUE_TEXT_CHOICE))
-            return false;
         return CoreSchema.getInstance().getSqlDialect().isPostgreSQL();
     }
 

api/src/org/labkey/api/query/AbstractQueryChangeListener.java

@@ -40,13 +40,13 @@ public void queryCreated(User user, Container container, ContainerFilter scope,
     protected abstract void queryCreated(User user, Container container, ContainerFilter scope, SchemaKey schema, String query);
 
     @Override
-    public void queryChanged(User user, Container container, ContainerFilter scope, SchemaKey schema, @NotNull QueryProperty property, @NotNull Collection<QueryPropertyChange<?>> changes)
+    public void queryChanged(User user, Container container, ContainerFilter scope, SchemaKey schema, String queryName, @NotNull QueryProperty property, @NotNull Collection<QueryPropertyChange<?>> changes)
     {
         for (QueryPropertyChange<?> change : changes)
-            queryChanged(user, container, scope, schema, change);
+            queryChanged(user, container, scope, schema, queryName, change);
     }
 
-    protected abstract void queryChanged(User user, Container container, ContainerFilter scope, SchemaKey schema, QueryPropertyChange<?> change);
+    protected abstract void queryChanged(User user, Container container, ContainerFilter scope, SchemaKey schema, String queryName, QueryPropertyChange<?> change);
 
     @Override
     public void queryDeleted(User user, Container container, ContainerFilter scope, SchemaKey schema, @NotNull Collection<String> queries)