From 94825e8720ca9c6eceff525b3544fbd10346613f Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Mon, 23 Feb 2026 16:36:11 -0800
Subject: [PATCH 1/2] ignore test for mssql

---
 .../src/org/labkey/test/tests/study/StudyDatasetsTest.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java b/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
index 8b75e673dea..1cb762a374a 100644
--- a/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
+++ b/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
@@ -17,6 +17,7 @@
 package org.labkey.test.tests.study;
 
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -24,6 +25,7 @@
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
 import org.labkey.test.TestFileUtils;
+import org.labkey.test.WebTestHelper;
 import org.labkey.test.categories.Daily;
 import org.labkey.test.components.LookAndFeelScatterPlot;
 import org.labkey.test.components.LookAndFeelTimeChart;
@@ -187,6 +189,7 @@ public void testDatasets()
     public void testDatasetWithMultiChoice()
     {
         OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
+        Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
         String datasetName = "Test dataset";
         DatasetDesignerPage definitionPage = _studyHelper.goToManageDatasets()
                 .clickCreateNewDataset()

From e2ada0686b275a178afb9c7b39991c6f92351d1e Mon Sep 17 00:00:00 2001
From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com>
Date: Tue, 24 Feb 2026 09:00:29 -0800
Subject: [PATCH 2/2] fix the order

---
 .../test/src/org/labkey/test/tests/study/StudyDatasetsTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java b/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
index 1cb762a374a..202ceadbffa 100644
--- a/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
+++ b/study/test/src/org/labkey/test/tests/study/StudyDatasetsTest.java
@@ -188,8 +188,8 @@ public void testDatasets()
     @Test
     public void testDatasetWithMultiChoice()
     {
-        OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
         Assume.assumeTrue("Multi-choice text fields are only supported on PostgreSQL", WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL);
+        OptionalFeatureHelper.enableOptionalFeature(getCurrentTest().createDefaultConnection(), "multiChoiceDataType");
         String datasetName = "Test dataset";
         DatasetDesignerPage definitionPage = _studyHelper.goToManageDatasets()
                 .clickCreateNewDataset()