Merge pull request #257 from LabKey/fb_merge_25.3_to_develop

Merge discvr-25.3 to develop

Author: bbimber

tcrdb/resources/schemas/dbscripts/postgresql/tcrdb-15.57-15.58.sql

@@ -0,0 +1,16 @@
+CREATE TABLE tcrdb.repertoire_stats (
+  rowid SERIAL,
+  cdna_id int,
+  metricName varchar(1000),
+  value double precision,
+  qualValue varchar(4000),
+  comment varchar(4000),
+
+  container entityid,
+  created timestamp,
+  createdby int,
+  modified timestamp,
+  modifiedby int,
+
+  constraint PK_repertoire_stats PRIMARY KEY (rowid)
+);

tcrdb/resources/schemas/dbscripts/sqlserver/tcrdb-15.57-15.58.sql

@@ -0,0 +1,16 @@
+CREATE TABLE tcrdb.repertoire_stats (
+  rowid int IDENTITY(1,1),
+  cdna_id int,
+  metricName varchar(1000),
+  value double precision,
+  qualValue varchar(4000),
+  comment varchar(4000),
+
+  container entityid,
+  created datetime,
+  createdby int,
+  modified datetime,
+  modifiedby int,
+
+  constraint PK_repertoire_stats PRIMARY KEY (rowid)
+);

tcrdb/resources/schemas/tcrdb.xml

@@ -325,6 +325,60 @@
             </column>
             <column columnName="comment">
 
+            </column>
+            <column columnName="container">
+                <isHidden>true</isHidden>
+            </column>
+            <column columnName="createdby">
+                <isHidden>true</isHidden>
+            </column>
+            <column columnName="created">
+                <isUserEditable>false</isUserEditable>
+                <shownInInsertView>false</shownInInsertView>
+                <shownInUpdateView>false</shownInUpdateView>
+                <nullable>true</nullable>
+                <isHidden>true</isHidden>
+            </column>
+            <column columnName="modifiedby">
+                <isHidden>true</isHidden>
+            </column>
+            <column columnName="modified">
+                <isUserEditable>false</isUserEditable>
+                <shownInInsertView>false</shownInInsertView>
+                <shownInUpdateView>false</shownInUpdateView>
+                <nullable>true</nullable>
+                <isHidden>true</isHidden>
+            </column>
+        </columns>
+    </table>
+    <table tableName="repertoire_stats" tableDbType="TABLE" useColumnOrder="true">
+        <javaCustomizer class="org.labkey.laboratory.query.LaboratoryTableCustomizer" />
+        <tableTitle>TCR Repertoire Stats</tableTitle>
+        <titleColumn>rowid</titleColumn>
+        <columns>
+            <column columnName="rowid">
+                <columnTitle>Row Id</columnTitle>
+                <isHidden>true</isHidden>
+            </column>
+            <column columnName="cdna_id">
+                <columnTitle>cDNA ID</columnTitle>
+                <fk>
+                    <fkDbSchema>singlecell</fkDbSchema>
+                    <fkTable>cdna_libraries</fkTable>
+                    <fkColumnName>rowid</fkColumnName>
+                </fk>
+            </column>
+            <column columnName="metricName">
+                <columnTitle>Metric Name</columnTitle>
+            </column>
+            <column columnName="value">
+                <columnTitle>Value</columnTitle>
+            </column>
+            <column columnName="qualValue">
+                <columnTitle>Qualitative Value</columnTitle>
+            </column>
+            <column columnName="comment">
+
             </column>
             <column columnName="container">
                 <isHidden>true</isHidden>

tcrdb/src/org/labkey/tcrdb/TCRdbModule.java

@@ -46,7 +46,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 15.57;
+        return 15.58;
     }
 
     @Override