reorder enumeration values in SQL scripts so new follow previous

ome · Sep 8, 2016 · 99b95c4 · 99b95c4
1 parent a782968
commit 99b95c4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/sql/psql/OMERO5.3DEV__10/enums_update.sql b/sql/psql/OMERO5.3DEV__10/enums_update.sql
@@ -9,10 +9,6 @@ insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'WideField' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'WideField') limit 1;
 
-insert into acquisitionmode (id,permissions,value)
-    select ome_nextval('seq_acquisitionmode'),-35,'BrightField' from acquisitionmode where not exists(
-        select 1 from acquisitionmode where value = 'BrightField') limit 1;
-
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'LaserScanningConfocalMicroscopy' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'LaserScanningConfocalMicroscopy') limit 1;
@@ -25,10 +21,6 @@ insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'SlitScanConfocal' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'SlitScanConfocal') limit 1;
 
-insert into acquisitionmode (id,permissions,value)
-    select ome_nextval('seq_acquisitionmode'),-35,'SweptFieldConfocal' from acquisitionmode where not exists(
-        select 1 from acquisitionmode where value = 'SweptFieldConfocal') limit 1;
-
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'MultiPhotonMicroscopy' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'MultiPhotonMicroscopy') limit 1;
@@ -89,10 +81,6 @@ insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'LCM' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'LCM') limit 1;
 
-insert into acquisitionmode (id,permissions,value)
-    select ome_nextval('seq_acquisitionmode'),-35,'SPIM' from acquisitionmode where not exists(
-        select 1 from acquisitionmode where value = 'SPIM') limit 1;
-
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'Other' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'Other') limit 1;
@@ -101,6 +89,18 @@ insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-35,'Unknown' from acquisitionmode where not exists(
         select 1 from acquisitionmode where value = 'Unknown') limit 1;
 
+insert into acquisitionmode (id,permissions,value)
+    select ome_nextval('seq_acquisitionmode'),-35,'BrightField' from acquisitionmode where not exists(
+        select 1 from acquisitionmode where value = 'BrightField') limit 1;
+
+insert into acquisitionmode (id,permissions,value)
+    select ome_nextval('seq_acquisitionmode'),-35,'SweptFieldConfocal' from acquisitionmode where not exists(
+        select 1 from acquisitionmode where value = 'SweptFieldConfocal') limit 1;
+
+insert into acquisitionmode (id,permissions,value)
+    select ome_nextval('seq_acquisitionmode'),-35,'SPIM' from acquisitionmode where not exists(
+        select 1 from acquisitionmode where value = 'SPIM') limit 1;
+
 insert into arctype (id,permissions,value)
     select ome_nextval('seq_arctype'),-35,'Hg' from arctype where not exists(
         select 1 from arctype where value = 'Hg') limit 1;

diff --git a/sql/psql/OMERO5.3DEV__10/psql-footer.sql b/sql/psql/OMERO5.3DEV__10/psql-footer.sql
@@ -2109,16 +2109,12 @@ alter table pixelstype alter column bitsize drop not null;
 
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'WideField';
-insert into acquisitionmode (id,permissions,value)
-    select ome_nextval('seq_acquisitionmode'),-52,'BrightField';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'LaserScanningConfocalMicroscopy';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'SpinningDiskConfocal';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'SlitScanConfocal';
-insert into acquisitionmode (id,permissions,value)
-    select ome_nextval('seq_acquisitionmode'),-52,'SweptFieldConfocal';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'MultiPhotonMicroscopy';
 insert into acquisitionmode (id,permissions,value)
@@ -2149,12 +2145,16 @@ insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'FSM';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'LCM';
-insert into acquisitionmode (id,permissions,value)
-    select ome_nextval('seq_acquisitionmode'),-52,'SPIM';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'Other';
 insert into acquisitionmode (id,permissions,value)
     select ome_nextval('seq_acquisitionmode'),-52,'Unknown';
+insert into acquisitionmode (id,permissions,value)
+    select ome_nextval('seq_acquisitionmode'),-52,'BrightField';
+insert into acquisitionmode (id,permissions,value)
+    select ome_nextval('seq_acquisitionmode'),-52,'SweptFieldConfocal';
+insert into acquisitionmode (id,permissions,value)
+    select ome_nextval('seq_acquisitionmode'),-52,'SPIM';
 insert into arctype (id,permissions,value)
     select ome_nextval('seq_arctype'),-52,'Hg';
 insert into arctype (id,permissions,value)