Skip to content

Conditional Check for DB #2660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-danield merged 2 commits into from
Aug 29, 2025
Merged

Conditional Check for DB #2660

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d9f743
Conditional check for DB.
labkey-danield Aug 29, 2025
a134af3
Fix typo.
labkey-danield Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/org/labkey/test/tests/SampleTypeRenameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down