From 1d9f7433289273dc445e5217523647263118cb9b Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Fri, 29 Aug 2025 14:33:55 -0700 Subject: [PATCH 1/2] Conditional check for DB. --- .../test/tests/SampleTypeRenameTest.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java index e61a745ea0..9842b6ea96 100644 --- a/src/org/labkey/test/tests/SampleTypeRenameTest.java +++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java @@ -7,6 +7,7 @@ import org.labkey.remoteapi.CommandException; import org.labkey.test.BaseWebDriverTest; import org.labkey.test.Locator; +import org.labkey.test.WebTestHelper; import org.labkey.test.categories.Daily; import org.labkey.test.components.ChartTypeDialog; import org.labkey.test.components.CustomizeView; @@ -110,14 +111,22 @@ public void testSampleTypeFieldRename() throws IOException, CommandException updatePage.getFieldsPanel().getField(FIELD_INT).setName(FIELD_INT + " Updated"); updatePage.setNameExpression("S-${genId}"); updatePage.clickSave(); - goToProjectHome(); - updatePage = sampleHelper.goToEditSampleType(sampleTypeName); - updatePage.getFieldsPanel().getField(FIELD_INT + " Updated").setName(FIELD_INT + " 2nd update"); - updatePage.clickSave(); - goToProjectHome(); - updatePage = sampleHelper.goToEditSampleType(sampleTypeName); - updatePage.getFieldsPanel().getField(FIELD_INT + " 2nd update").setName(FIELD_INT + " 3rd"); - updatePage.clickSave(); + + //Issue 51979: BadSqlGrammarException indexing sample types immediately after a field rename + // This issue has been fixed in Postgres, but continues to fail in MSSQL. Many attempts were made to fix in + // MSSQL, but it was decided not to spend any more time on it (for MSSQL). + // Only do these other "rapid fire" updates if on Postgre. + if (WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL) + { + goToProjectHome(); + updatePage = sampleHelper.goToEditSampleType(sampleTypeName); + updatePage.getFieldsPanel().getField(FIELD_INT + " Updated").setName(FIELD_INT + " 2nd update"); + updatePage.clickSave(); + goToProjectHome(); + updatePage = sampleHelper.goToEditSampleType(sampleTypeName); + updatePage.getFieldsPanel().getField(FIELD_INT + " 2nd update").setName(FIELD_INT + " 3rd"); + updatePage.clickSave(); + } SearchAdminAPIHelper.waitForIndexer(); From a134af3f39ad7c4ea349b211d8f372e41f23d211 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Fri, 29 Aug 2025 14:34:26 -0700 Subject: [PATCH 2/2] Fix typo. --- src/org/labkey/test/tests/SampleTypeRenameTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java index 9842b6ea96..f75a3fe7be 100644 --- a/src/org/labkey/test/tests/SampleTypeRenameTest.java +++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java @@ -113,7 +113,7 @@ public void testSampleTypeFieldRename() throws IOException, CommandException updatePage.clickSave(); //Issue 51979: BadSqlGrammarException indexing sample types immediately after a field rename - // This issue has been fixed in Postgres, but continues to fail in MSSQL. Many attempts were made to fix in + // This issue has been fixed in Postgres but continues to fail in MSSQL. Many attempts were made to fix in // MSSQL, but it was decided not to spend any more time on it (for MSSQL). // Only do these other "rapid fire" updates if on Postgre. if (WebTestHelper.getDatabaseType() == WebTestHelper.DatabaseType.PostgreSQL)