Skip to content

Commit e4cca5e

Browse files
authored
Merge pull request #410 from LabKey/fb_merge_25.11_to_develop
Merge discvr-25.11 to develop
2 parents 94d358a + 39331d1 commit e4cca5e

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

SequenceAnalysis/resources/schemas/dbscripts/sqlserver/SequenceAnalysis-12.329-12.330.sql

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,17 @@ CREATE NONCLUSTERED INDEX IDX_alignment_summary_analysis_id_rowid_container_tota
1717
rowid ASC,
1818
container ASC
1919
)
20-
INCLUDE(total)
20+
INCLUDE(total);
2121

22-
CREATE STATISTICS STAT_ref_nt_sequence_rowid_locus_container ON sequenceanalysis.ref_nt_sequences (RowId, locus, container)
23-
WITH AUTO_DROP = OFF
22+
CREATE STATISTICS STAT_ref_nt_sequence_rowid_locus_container ON sequenceanalysis.ref_nt_sequences (RowId, locus, container);
2423

25-
CREATE STATISTICS STAT_ref_nt_sequence_locus_container ON sequenceanalysis.ref_nt_sequences (locus, container)
26-
WITH AUTO_DROP = OFF
24+
CREATE STATISTICS STAT_ref_nt_sequence_locus_container ON sequenceanalysis.ref_nt_sequences (locus, container);
2725

28-
CREATE STATISTICS STAT_sequence_analyses_container_readset ON sequenceanalysis.sequence_analyses (Container, readset)
29-
WITH AUTO_DROP = OFF
26+
CREATE STATISTICS STAT_sequence_analyses_container_readset ON sequenceanalysis.sequence_analyses (Container, readset);
3027

31-
CREATE STATISTICS STAT_sequence_readsets_rowid_container ON sequenceanalysis.sequence_readsets (RowId, Container)
32-
WITH AUTO_DROP = OFF
28+
CREATE STATISTICS STAT_sequence_readsets_rowid_container ON sequenceanalysis.sequence_readsets (RowId, Container);
3329

34-
CREATE STATISTICS STAT_asj_alignmentid_container_ref_nt_id ON sequenceanalysis.alignment_summary_junction (alignment_id, container, ref_nt_id)
35-
WITH AUTO_DROP = OFF
30+
CREATE STATISTICS STAT_asj_alignmentid_container_ref_nt_id ON sequenceanalysis.alignment_summary_junction (alignment_id, container, ref_nt_id);
3631

37-
CREATE STATISTICS STAT_asj_alignmentid_ref_nt_id_status_alignment_id ON sequenceanalysis.alignment_summary_junction (ref_nt_id, status, alignment_id)
38-
WITH AUTO_DROP = OFF
32+
CREATE STATISTICS STAT_asj_alignmentid_ref_nt_id_status_alignment_id ON sequenceanalysis.alignment_summary_junction (ref_nt_id, status, alignment_id);
3933

singlecell/src/org/labkey/singlecell/run/CellRangerGexCountStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,8 @@ public enum Chemistry
626626
// cellranger-x.y.z/lib/python/cellranger/barcodes/
627627
FivePE_V3("Single Cell 5' PE v3", "3M-5pgex-jan-2023.txt.gz"),
628628
FivePE_V2("Single Cell 5' PE v2", "737k-august-2016.txt"),
629-
FivePE_V1("Single Cell 5' PE", "737K-april-2014_rc.txt");
629+
FivePE_V1("Single Cell 5' PE", "737k-august-2016.txt");
630+
// Single Cell 3' v1: 737K-april-2014_rc.txt
630631

631632
final String _label;
632633
final String _inclusionListFile;

0 commit comments

Comments
 (0)