Skip to content

Compensate for SQL Server timestamp granularity #7199

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-tchad merged 1 commit into from
Nov 12, 2025
Merged

Compensate for SQL Server timestamp granularity #7199

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 16 additions & 15 deletions assay/src/org/labkey/assay/AssayIntegrationTestCase.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
<%@ page import="org.apache.commons.collections.MapUtils" %>
<%@ page import="org.apache.logging.log4j.LogManager" %>
<%@ page import="org.apache.logging.log4j.Logger" %>
<%@ page import="org.hamcrest.MatcherAssert" %>
<%@ page import="org.jetbrains.annotations.Nullable" %>
<%@ page import="org.junit.After" %>
<%@ page import="org.junit.Before" %>
<%@ page import="org.junit.Test" %>
Expand Down Expand Up @@ -47,19 +49,24 @@
<%@ page import="org.labkey.api.exp.api.ExpMaterial" %>
<%@ page import="org.labkey.api.exp.api.ExpProtocol" %>
<%@ page import="org.labkey.api.exp.api.ExpRun" %>
<%@ page import="org.labkey.api.exp.api.ExpSampleType" %>
<%@ page import="org.labkey.api.exp.api.ExperimentService" %>
<%@ page import="org.labkey.api.exp.api.SampleTypeService" %>
<%@ page import="org.labkey.api.exp.property.Domain" %>
<%@ page import="org.labkey.api.exp.property.DomainProperty" %>
<%@ page import="org.labkey.api.exp.property.PropertyService" %>
<%@ page import="org.labkey.api.exp.query.ExpSchema" %>
<%@ page import="org.labkey.api.exp.query.SamplesSchema" %>
<%@ page import="org.labkey.api.files.FileContentService" %>
<%@ page import="org.labkey.api.files.FilesAdminOptions" %>
<%@ page import="org.labkey.api.gwt.client.assay.model.GWTProtocol" %>
<%@ page import="org.labkey.api.gwt.client.model.GWTDomain" %>
<%@ page import="org.labkey.api.gwt.client.model.GWTPropertyDescriptor" %>
<%@ page import="org.labkey.api.pipeline.PipeRoot" %>
<%@ page import="org.labkey.api.pipeline.PipelineService" %>
<%@ page import="org.labkey.api.query.BatchValidationException" %>
<%@ page import="org.labkey.api.query.FieldKey" %>
<%@ page import="org.labkey.api.query.QueryService" %>
<%@ page import="org.labkey.api.query.QueryUpdateService" %>
<%@ page import="org.labkey.api.query.ValidationException" %>
<%@ page import="org.labkey.api.security.User" %>
Expand All @@ -71,31 +78,24 @@
<%@ page import="org.labkey.api.view.ViewContext" %>
<%@ page import="org.labkey.assay.AssayDomainServiceImpl" %>
<%@ page import="org.labkey.assay.TsvAssayProvider" %>
<%@ page import="org.labkey.vfs.FileSystemLike" %>
<%@ page import="org.springframework.mock.web.MockMultipartHttpServletRequest" %>
<%@ page import="java.io.File" %>
<%@ page import="static org.junit.Assert.*" %>
<%@ page import="static org.labkey.api.files.FileContentService.UPLOADED_FILE" %>
<%@ page import="static org.hamcrest.CoreMatchers.hasItem" %>
<%@ page import="static org.hamcrest.CoreMatchers.not" %>
<%@ page import="java.io.IOException" %>
<%@ page import="java.nio.charset.StandardCharsets" %>
<%@ page import="static java.util.Collections.emptyList" %>
<%@ page import="java.nio.file.Files" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="static org.labkey.api.exp.query.SamplesSchema.SCHEMA_SAMPLES" %>
<%@ page import="java.util.Collections" %>
<%@ page import="java.util.HashSet" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.Set" %>
<%@ page import="static org.junit.Assert.*" %>
<%@ page import="static org.labkey.api.files.FileContentService.UPLOADED_FILE" %>
<%@ page import="static org.hamcrest.CoreMatchers.hasItem" %>
<%@ page import="static org.hamcrest.CoreMatchers.not" %>
<%@ page import="org.labkey.api.exp.api.ExpSampleType" %>
<%@ page import="org.labkey.api.exp.api.SampleTypeService" %>
<%@ page import="static java.util.Collections.emptyList" %>
<%@ page import="org.labkey.api.exp.query.SamplesSchema" %>
<%@ page import="org.labkey.api.query.QueryService" %>
<%@ page import="static org.labkey.api.exp.query.SamplesSchema.SCHEMA_SAMPLES" %>
<%@ page import="org.labkey.api.pipeline.PipeRoot" %>
<%@ page import="org.jetbrains.annotations.Nullable" %>
<%@ page import="java.io.IOException" %>
<%@ page import="org.apache.commons.collections.MapUtils" %>
<%@ page import="org.labkey.vfs.FileSystemLike" %>
<%@ page import="static org.junit.Assert.assertEquals" %>
<%@ page import="static org.junit.Assert.assertNotEquals" %>

Expand Down Expand Up @@ -580,6 +580,7 @@
updated.put("ResultProp", 200);
updated.put("RowId", resultRowId);
errors = new BatchValidationException();
Thread.sleep(5); // SQL Server timestamps aren't granular enough to guarantee different modified time
resultsQUS.updateRows(user, c, Collections.singletonList(updated), null, errors, null, null);

// verify result created matches run's created in query table, but result modified now differs from run's created
Expand Down