From 4bb93fb711e0d6cc571283eddbb294c0d42e1fc3 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Tue, 31 Dec 2024 04:32:36 -0800 Subject: [PATCH] Bump schema versions to 25.000 (#831) --- elisa/src/org/labkey/elisa/ElisaModule.java | 2 +- .../src/org/labkey/elispot/ElispotModule.java | 2 +- .../elispot/query/ElispotAntigenDomainKind.java | 16 ---------------- flow/src/org/labkey/flow/FlowModule.java | 2 +- .../src/org/labkey/luminex/LuminexModule.java | 2 +- .../org/labkey/microarray/MicroarrayModule.java | 2 +- ms2/src/org/labkey/ms2/MS2Module.java | 2 +- nab/src/org/labkey/nab/NabModule.java | 2 +- .../org/labkey/nab/query/NabVirusDomainKind.java | 16 ---------------- .../src/org/labkey/protein/ProteinModule.java | 2 +- .../org/labkey/viability/ViabilityModule.java | 2 +- 11 files changed, 9 insertions(+), 41 deletions(-) diff --git a/elisa/src/org/labkey/elisa/ElisaModule.java b/elisa/src/org/labkey/elisa/ElisaModule.java index 5007b42374..4eb2dfd3c9 100644 --- a/elisa/src/org/labkey/elisa/ElisaModule.java +++ b/elisa/src/org/labkey/elisa/ElisaModule.java @@ -43,7 +43,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/elispotassay/src/org/labkey/elispot/ElispotModule.java b/elispotassay/src/org/labkey/elispot/ElispotModule.java index a4e54709ed..3d8072f0b1 100644 --- a/elispotassay/src/org/labkey/elispot/ElispotModule.java +++ b/elispotassay/src/org/labkey/elispot/ElispotModule.java @@ -46,7 +46,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/elispotassay/src/org/labkey/elispot/query/ElispotAntigenDomainKind.java b/elispotassay/src/org/labkey/elispot/query/ElispotAntigenDomainKind.java index 5c07bc136d..2679439c28 100644 --- a/elispotassay/src/org/labkey/elispot/query/ElispotAntigenDomainKind.java +++ b/elispotassay/src/org/labkey/elispot/query/ElispotAntigenDomainKind.java @@ -16,8 +16,6 @@ package org.labkey.elispot.query; import org.labkey.api.assay.AssayDomainKind; -import org.labkey.api.data.DbSchema; -import org.labkey.api.data.DbSchemaType; import org.labkey.api.data.DbScope; import org.labkey.api.data.JdbcType; import org.labkey.api.data.PropertyStorageSpec; @@ -32,9 +30,6 @@ import java.util.LinkedHashSet; import java.util.Set; -/** - * Created by davebradlee on 3/24/15. - */ public class ElispotAntigenDomainKind extends AssayDomainKind { public static final String KINDNAME = "ElispotAntigenDomainKind"; @@ -91,17 +86,6 @@ public String getStorageSchemaName() return ElispotProtocolSchema.ELISPOT_ANTIGEN_SCHEMA_NAME; } - private DbSchema getSchema() - { - return DbSchema.get(getStorageSchemaName(), getSchemaType()); - } - - @Override - public DbSchemaType getSchemaType() - { - return DbSchemaType.Provisioned; - } - @Override public Set getReservedPropertyNames(Domain domain, User user) { diff --git a/flow/src/org/labkey/flow/FlowModule.java b/flow/src/org/labkey/flow/FlowModule.java index a1cbaaebe2..cbe2d66b21 100644 --- a/flow/src/org/labkey/flow/FlowModule.java +++ b/flow/src/org/labkey/flow/FlowModule.java @@ -110,7 +110,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/luminex/src/org/labkey/luminex/LuminexModule.java b/luminex/src/org/labkey/luminex/LuminexModule.java index 5c48eb4360..7fb1317cd7 100644 --- a/luminex/src/org/labkey/luminex/LuminexModule.java +++ b/luminex/src/org/labkey/luminex/LuminexModule.java @@ -45,7 +45,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/microarray/src/org/labkey/microarray/MicroarrayModule.java b/microarray/src/org/labkey/microarray/MicroarrayModule.java index 30a0dfd122..d8f02790f9 100644 --- a/microarray/src/org/labkey/microarray/MicroarrayModule.java +++ b/microarray/src/org/labkey/microarray/MicroarrayModule.java @@ -58,7 +58,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/ms2/src/org/labkey/ms2/MS2Module.java b/ms2/src/org/labkey/ms2/MS2Module.java index f37dffbcb3..2dc56425bc 100644 --- a/ms2/src/org/labkey/ms2/MS2Module.java +++ b/ms2/src/org/labkey/ms2/MS2Module.java @@ -118,7 +118,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/nab/src/org/labkey/nab/NabModule.java b/nab/src/org/labkey/nab/NabModule.java index 31088c0d21..6f9d220b24 100644 --- a/nab/src/org/labkey/nab/NabModule.java +++ b/nab/src/org/labkey/nab/NabModule.java @@ -56,7 +56,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override diff --git a/nab/src/org/labkey/nab/query/NabVirusDomainKind.java b/nab/src/org/labkey/nab/query/NabVirusDomainKind.java index 025b563c5b..5da55e90e4 100644 --- a/nab/src/org/labkey/nab/query/NabVirusDomainKind.java +++ b/nab/src/org/labkey/nab/query/NabVirusDomainKind.java @@ -16,8 +16,6 @@ package org.labkey.nab.query; import org.labkey.api.assay.AssayDomainKind; -import org.labkey.api.data.DbSchema; -import org.labkey.api.data.DbSchemaType; import org.labkey.api.data.DbScope; import org.labkey.api.data.JdbcType; import org.labkey.api.data.PropertyStorageSpec; @@ -30,9 +28,6 @@ import java.util.LinkedHashSet; import java.util.Set; -/** - * Created by klum on 7/18/2014. - */ public class NabVirusDomainKind extends AssayDomainKind { public static final String VIRUS_LSID_COLUMN_NAME = "virusLsid"; @@ -78,17 +73,6 @@ public String getStorageSchemaName() return NabProtocolSchema.NAB_VIRUS_SCHEMA_NAME; } - private DbSchema getSchema() - { - return DbSchema.get(getStorageSchemaName(), getSchemaType()); - } - - @Override - public DbSchemaType getSchemaType() - { - return DbSchemaType.Provisioned; - } - @Override public Set getReservedPropertyNames(Domain domain, User user) { diff --git a/protein/src/org/labkey/protein/ProteinModule.java b/protein/src/org/labkey/protein/ProteinModule.java index 80066bb59f..1ebf33e9b1 100644 --- a/protein/src/org/labkey/protein/ProteinModule.java +++ b/protein/src/org/labkey/protein/ProteinModule.java @@ -62,7 +62,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.002; + return 25.000; } @Override diff --git a/viability/src/org/labkey/viability/ViabilityModule.java b/viability/src/org/labkey/viability/ViabilityModule.java index 77e590c8ca..2b87ba0718 100644 --- a/viability/src/org/labkey/viability/ViabilityModule.java +++ b/viability/src/org/labkey/viability/ViabilityModule.java @@ -42,7 +42,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 24.000; + return 25.000; } @Override