Merge remote-tracking branch 'origin/develop' into fb_long_is_the_new_int

labkey-matthewb · labkey-matthewb · commit 7ae91e0483ee · 2025-08-08T11:27:36.000-07:00
diff --git a/LDK/resources/queries/core/DistinctUsersByMonth.sql b/LDK/resources/queries/core/DistinctUsersByMonth.sql
@@ -24,15 +24,15 @@ from (
 
 SELECT
 
-year(a.date) as year,
-month(a.date) as month,
+year(a.Created) as year,
+month(a.Created) as month,
 a.CreatedBy.DisplayName as user
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 
-WHERE a.EventType = 'UserAuditEvent' AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 
-GROUP BY year(a.date), month(a.date), a.CreatedBy.DisplayName
+GROUP BY year(a.Created), month(a.Created), a.CreatedBy.DisplayName
 
 ) a
 
diff --git a/LDK/resources/queries/core/SiteUsageByDay.sql b/LDK/resources/queries/core/SiteUsageByDay.sql
@@ -15,20 +15,19 @@
  */
 SELECT
 
-cast(a.date as date) as date,
+cast(a.Created as date) as Date,
 CASE
-  WHEN dayofweek(cast(a.date as date)) = 1 THEN 'Sunday'
-  WHEN dayofweek(cast(a.date as date)) = 2 THEN 'Monday'
-  WHEN dayofweek(cast(a.date as date)) = 3 THEN 'Tuesday'
-  WHEN dayofweek(cast(a.date as date)) = 4 THEN 'Wednesday'
-  WHEN dayofweek(cast(a.date as date)) = 5 THEN 'Thursday'
-  WHEN dayofweek(cast(a.date as date)) = 6 THEN 'Friday'
-  WHEN dayofweek(cast(a.date as date)) = 7 THEN 'Saturday'
+    WHEN dayofweek(cast(a.Created as date)) = 1 THEN 'Sunday'
+    WHEN dayofweek(cast(a.Created as date)) = 2 THEN 'Monday'
+    WHEN dayofweek(cast(a.Created as date)) = 3 THEN 'Tuesday'
+    WHEN dayofweek(cast(a.Created as date)) = 4 THEN 'Wednesday'
+    WHEN dayofweek(cast(a.Created as date)) = 5 THEN 'Thursday'
+    WHEN dayofweek(cast(a.Created as date)) = 6 THEN 'Friday'
+    WHEN dayofweek(cast(a.Created as date)) = 7 THEN 'Saturday'
 END as dayOfWeek,
 count(*) AS Logins
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 
-WHERE a.EventType = 'UserAuditEvent'
-AND a.Comment LIKE '%logged in%'
-GROUP BY cast(a.date as date)
+WHERE a.Comment LIKE '%logged in%'
+GROUP BY cast(a.Created as date)
diff --git a/LDK/resources/queries/core/SiteUsageByHour.sql b/LDK/resources/queries/core/SiteUsageByHour.sql
@@ -16,11 +16,11 @@
 SELECT
 
 
-hour(a.date) as Hour,
+hour(a.Created) as Hour,
 count(*) AS Visits
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 
-WHERE a.EventType = 'UserAuditEvent' AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 
-GROUP BY hour(a.date)
+GROUP BY hour(a.Created)
diff --git a/LDK/resources/queries/core/SiteUsageByMonth.sql b/LDK/resources/queries/core/SiteUsageByMonth.sql
@@ -15,15 +15,14 @@
  */
 SELECT
 
-year(a.date) as year,
-month(a.date) as month,
-cast(cast(year(a.date) as varchar) || '-' || cast(month(a.date) as varchar) || '-01' as DATE) as date,
+year(a.Created) as year,
+month(a.Created) as month,
+cast(cast(year(a.Created) as varchar) || '-' || cast(month(a.Created) as varchar) || '-01' as DATE) as date,
 count(*) AS Logins
 
-FROM "/".auditlog.audit a
+FROM "/".auditlog.UserAuditEvent a
 --FROM audit_pg.auditLog a
 
-WHERE a.EventType = 'UserAuditEvent'
-AND a.Comment LIKE '%logged in%'
+WHERE a.Comment LIKE '%logged in%'
 
-GROUP BY year(a.date), month(a.date)
+GROUP BY year(a.Created), month(a.Created)
diff --git a/LDK/resources/queries/core/SiteUsageByUser.sql b/LDK/resources/queries/core/SiteUsageByUser.sql
@@ -17,7 +17,7 @@ PARAMETERS(MinDate TIMESTAMP)
 
 SELECT
 a.CreatedBy,
-COUNT(a.Date) AS LogInCount
-FROM "/".auditlog.audit a
-WHERE a.Comment LIKE '%logged in%' AND cast(a.date as date) >= cast(MinDate as date)
+COUNT(a.Created) AS LogInCount
+FROM "/".auditlog.UserAuditEvent a
+WHERE a.Comment LIKE '%logged in%' AND cast(a.Created as date) >= cast(MinDate as date)
 GROUP BY a.CreatedBy
diff --git a/LDK/resources/queries/core/SiteUsagePerGroup.sql b/LDK/resources/queries/core/SiteUsagePerGroup.sql
@@ -17,15 +17,15 @@ SELECT
 
 m.UserId,
 g.Name AS GroupName,
-a.Date,
+a.Created AS Date,
 a.EventType
 
 FROM core.groups g
 
 LEFT JOIN core.Members m ON (g.UserId = m.GroupId.UserId)
-LEFT JOIN "/".auditlog.audit a
-ON (a.CreatedBy.UserId = m.UserId.UserId AND a.EventType = 'UserAuditEvent' AND a.Comment LIKE '%logged in%')
+LEFT JOIN "/".auditlog.UserAuditEvent a
+ON (a.CreatedBy.UserId = m.UserId.UserId AND a.Comment LIKE '%logged in%')
 
 WHERE g.Name IS NOT NULL
 AND g.Name != ''
-AND a.Date IS NOT NULL
+AND a.Created IS NOT NULL
diff --git a/LDK/resources/schemas/dbscripts/postgresql/ldk-0.01-0.02.sql b/LDK/resources/schemas/dbscripts/postgresql/ldk-0.01-0.02.sql
@@ -19,6 +19,7 @@ CREATE TABLE ldk.integers (
   CONSTRAINT PK_integers PRIMARY KEY (value)
 );
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO ldk.integers (value) VALUES (0);
 INSERT INTO ldk.integers (value) VALUES (1);
 INSERT INTO ldk.integers (value) VALUES (2);
@@ -120,4 +121,4 @@ INSERT INTO ldk.integers (value) VALUES (97);
 INSERT INTO ldk.integers (value) VALUES (98);
 INSERT INTO ldk.integers (value) VALUES (99);
 INSERT INTO ldk.integers (value) VALUES (100);
-
+-- @SkipOnEmptySchemasEnd
diff --git a/LDK/resources/schemas/dbscripts/postgresql/ldk-12.32-12.33.sql b/LDK/resources/schemas/dbscripts/postgresql/ldk-12.32-12.33.sql
@@ -1,3 +1,4 @@
+-- @SkipOnEmptySchemasBegin
 INSERT INTO ldk.integers (value) VALUES (101);
 INSERT INTO ldk.integers (value) VALUES (102);
 INSERT INTO ldk.integers (value) VALUES (103);
@@ -898,3 +899,4 @@ INSERT INTO ldk.integers (value) VALUES (997);
 INSERT INTO ldk.integers (value) VALUES (998);
 INSERT INTO ldk.integers (value) VALUES (999);
 INSERT INTO ldk.integers (value) VALUES (1000);
+-- @SkipOnEmptySchemasEnd
diff --git a/LDK/resources/schemas/dbscripts/postgresql/ldk-12.35-12.36.sql b/LDK/resources/schemas/dbscripts/postgresql/ldk-12.35-12.36.sql
@@ -5,10 +5,12 @@ CREATE TABLE ldk.daysOfWeek (
   CONSTRAINT PK_daysOfWeek PRIMARY KEY (idx)
 );
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO ldk.daysOfWeek (idx, name) VALUES (1, 'Sunday');
 INSERT INTO ldk.daysOfWeek (idx, name) VALUES (2, 'Monday');
 INSERT INTO ldk.daysOfWeek (idx, name) VALUES (3, 'Tuesday');
 INSERT INTO ldk.daysOfWeek (idx, name) VALUES (4, 'Wednesday');
 INSERT INTO ldk.daysOfWeek (idx, name) VALUES (5, 'Thursday');
 INSERT INTO ldk.daysOfWeek (idx, name) VALUES (6, 'Friday');
-INSERT INTO ldk.daysOfWeek (idx, name) VALUES (7, 'Saturday');
+INSERT INTO ldk.daysOfWeek (idx, name) VALUES (7, 'Saturday');
+-- @SkipOnEmptySchemasEnd
diff --git a/LDK/resources/schemas/dbscripts/postgresql/ldk-12.36-12.37.sql b/LDK/resources/schemas/dbscripts/postgresql/ldk-12.36-12.37.sql
@@ -6,6 +6,7 @@ CREATE TABLE ldk.months (
     CONSTRAINT PK_months PRIMARY KEY (rowid)
 );
 
+-- @SkipOnEmptySchemasBegin
 INSERT into ldk.months (monthName, monthNum) VALUES ('January', 1);
 INSERT into ldk.months (monthName, monthNum) VALUES ('February', 2);
 INSERT into ldk.months (monthName, monthNum) VALUES ('March', 3);
@@ -18,3 +19,4 @@ INSERT into ldk.months (monthName, monthNum) VALUES ('September', 9);
 INSERT into ldk.months (monthName, monthNum) VALUES ('October', 10);
 INSERT into ldk.months (monthName, monthNum) VALUES ('November', 11);
 INSERT into ldk.months (monthName, monthNum) VALUES ('December', 12);
+-- @SkipOnEmptySchemasEnd
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-0.00-11.10.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-0.00-11.10.sql
@@ -216,11 +216,13 @@ WITH (OIDS=FALSE);
 -- ----------------------------
 -- Records of laboratory.dna_mol_type
 -- ----------------------------
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.dna_mol_type VALUES ('mRNA');
 INSERT INTO laboratory.dna_mol_type VALUES ('vRNA');
 INSERT INTO laboratory.dna_mol_type VALUES ('gDNA');
 INSERT INTO laboratory.dna_mol_type VALUES ('Plasmid');
 INSERT INTO laboratory.dna_mol_type VALUES ('RNA');
+-- @SkipOnEmptySchemasEnd
 
 -- ----------------------------
 -- Table structure for laboratory.sample_type
@@ -236,6 +238,7 @@ WITH (OIDS=FALSE);
 -- ----------------------------
 -- Records of sample_type
 -- ----------------------------
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.sample_type VALUES ('Nasal swab');
 INSERT INTO laboratory.sample_type VALUES ('PBMC');
 INSERT INTO laboratory.sample_type VALUES ('Plasma');
@@ -245,6 +248,7 @@ INSERT INTO laboratory.sample_type VALUES ('Total RNA');
 INSERT INTO laboratory.sample_type VALUES ('mRNA');
 INSERT INTO laboratory.sample_type VALUES ('vRNA');
 INSERT INTO laboratory.sample_type VALUES ('RNA');
+-- @SkipOnEmptySchemasEnd
 
 -- ----------------------------
 -- Table structure for laboratory.sample_additive
@@ -256,10 +260,12 @@ CREATE TABLE laboratory.sample_additive
     CONSTRAINT PK_sample_additive PRIMARY KEY (additive)
 ) WITH (OIDS=FALSE);
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.sample_additive (Additive) VALUES
     ('EDTA'),
     ('Heparin'),
     ('RNA Later'),
     ('Sodium citrate');
 
-INSERT INTO laboratory.sample_type VALUES ('Cell Line');
+INSERT INTO laboratory.sample_type VALUES ('Cell Line');
+-- @SkipOnEmptySchemasEnd
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-11.10-11.20.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-11.10-11.20.sql
@@ -26,11 +26,13 @@ ALTER TABLE laboratory.inventory
 
 /* laboratory-11.13-11.14.sql */
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.sample_type VALUES
 ('BLCL'),
 ('DNA'),
 ('Whole Blood')
 ;
+-- @SkipOnEmptySchemasEnd
 
 ALTER TABLE laboratory.inventory
   add column cell_number float
@@ -124,6 +126,7 @@ CREATE TABLE laboratory.report_types
   CONSTRAINT pk_report_types PRIMARY KEY (type )
 );
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.report_types
 (type) VALUES
 ('query'),
@@ -132,7 +135,7 @@ INSERT INTO laboratory.report_types
 ('webpart'),
 ('details')
 ;
-
+-- @SkipOnEmptySchemasEnd
 
 -- ----------------------------
 -- Table structure for laboratory.subjects
@@ -181,6 +184,7 @@ WITH (OIDS=FALSE)
 -- ----------------------------
 -- Records of laboratory.species
 -- ----------------------------
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.species
 (common_name, scientific_name, mhc_prefix)
 VALUES
@@ -197,7 +201,7 @@ VALUES
 ('Mouse', 'Mus musculus', null),
 ('Rat', 'Rattus norvegicus', null)
 ;
-
+-- @SkipOnEmptySchemasEnd
 
 DROP TABLE IF EXISTS laboratory.geographic_origins;
 CREATE TABLE laboratory.geographic_origins (
@@ -226,6 +230,7 @@ CREATE TABLE laboratory.well_layout (
   CONSTRAINT PK_well_layout PRIMARY KEY (rowid)
 );
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.well_layout
 (Plate,Well_96,Well_96_Padded,Well_384,Well_384_Padded,AddressByRow_96,AddressByColumn_96,AddressByColumn_384,AddressByRow_384)
 VALUES
@@ -614,7 +619,7 @@ VALUES
 (4, 'H11', 'H11', 'P23', 'P23', 95, 88, 368, 383),
 (4, 'H12', 'H12', 'P24', 'P24', 96, 96, 384, 384)
 ;
-
+-- @SkipOnEmptySchemasEnd
 
 -- ----------------------------
 -- Table structure for laboratory.genders
@@ -631,17 +636,22 @@ WITH (OIDS=FALSE)
 
 ;
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.genders
 (code, meaning, numericvalue)
 VALUES
 ('m', 'Male', 1),
 ('f', 'Female', 2),
 ('u', 'Unknown', 0)
 ;
+-- @SkipOnEmptySchemasEnd
 
 drop table if exists laboratory.samples;
 
+-- @SkipOnEmptySchemasBegin
 insert into laboratory.sample_type (type) values ('gDNA');
+-- @SkipOnEmptySchemasEnd
+
 insert into laboratory.sample_source (source) values ('gDNA');
 insert into laboratory.sample_source (source) values ('DNA');
 
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-11.20-11.30.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-11.20-11.30.sql
@@ -21,7 +21,7 @@ alter table laboratory.samples
   add column subjectid varchar(200)
 ;
 
-
+-- @SkipOnEmptySchemasBegin
 insert into laboratory.species
 (common_name,scientific_name)
 values
@@ -35,6 +35,7 @@ values
 insert into laboratory.dna_mol_type
 (mol_type) values ('Vector')
 ;
+-- @SkipOnEmptySchemasEnd
 
 DROP TABLE IF EXISTS laboratory.site_module_properties;
 CREATE TABLE laboratory.site_module_properties (
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.20-12.21.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.20-12.21.sql
@@ -34,10 +34,12 @@ CREATE TABLE laboratory.qual_results
     CONSTRAINT PK_qual_results PRIMARY KEY (rowid)
 );
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.qual_results (meaning, description) VALUES ('POS', 'Positive');
 INSERT INTO laboratory.qual_results (meaning, description) VALUES ('NEG', 'Negative');
 INSERT INTO laboratory.qual_results (meaning, description) VALUES ('OUTLIER', 'Outlier');
 INSERT INTO laboratory.qual_results (meaning, description) VALUES ('ND', 'No Data');
+-- @SkipOnEmptySchemasEnd
 
 CREATE TABLE laboratory.assay_requests
 (
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.22-12.23.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.22-12.23.sql
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 delete from laboratory.reference_peptides;
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('AAAQQRGPRK', null);
 INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('AADWDLQHPQ', null);
 INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('AADWDLQHPQPAPQQGQLRE', null);
@@ -5017,3 +5018,4 @@ INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('Y
 INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('YYREGRDQLWKGPGE', null);
 INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('YYSARRHRIL', null);
 INSERT INTO laboratory.reference_peptides (sequence, mhc_restriction) VALUES ('YYSARRHRILDIYLE', null);
+-- @SkipOnEmptySchemasEnd
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.24-12.25.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.24-12.25.sql
@@ -13,12 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+-- @SkipOnEmptySchemasBegin
 DELETE FROM laboratory.sample_type WHERE type = 'Serum';
 INSERT INTO laboratory.sample_type (type) VALUES ('Serum');
 DELETE FROM laboratory.sample_type WHERE type = 'Tissue';
 INSERT INTO laboratory.sample_type (type) VALUES ('Tissue');
 DELETE FROM laboratory.sample_type WHERE type = 'Supernatant';
 INSERT INTO laboratory.sample_type (type) VALUES ('Supernatant');
+-- @SkipOnEmptySchemasEnd
 
 -- NOTE: SQLServer will not allow 2 FKs pointing to the same table with update cascade
 -- therefore rather than let 1 field update and the other not, we get rid of both
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.25-12.26.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.25-12.26.sql
@@ -17,4 +17,7 @@ DROP TABLE laboratory.site_module_properties;
 DROP TABLE laboratory.module_properties;
 
 INSERT INTO laboratory.samplecategory (category) VALUES ('NTC');
-INSERT INTO laboratory.samplecategory (category) VALUES ('Unknown');
+
+-- @SkipOnEmptySchemasBegin
+INSERT INTO laboratory.samplecategory (category) VALUES ('Unknown');
+-- @SkipOnEmptySchemasEnd
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.273-12.274.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.273-12.274.sql
@@ -9,11 +9,13 @@ DELETE FROM laboratory.samplecategory WHERE category = 'Pos Control';
 DELETE FROM laboratory.samplecategory WHERE category = 'Neg Control';
 DELETE FROM laboratory.samplecategory WHERE category = 'Control';
 
+-- @SkipOnEmptySchemasBegin
 INSERT INTO laboratory.samplecategory (category) VALUES ('Pos Control');
 INSERT INTO laboratory.samplecategory (category) VALUES ('Neg Control');
 INSERT INTO laboratory.samplecategory (category) VALUES ('Control');
 INSERT INTO laboratory.samplecategory (category) VALUES ('Blank');
 INSERT INTO laboratory.samplecategory (category) VALUES ('Standard');
+-- @SkipOnEmptySchemasEnd
 
 ALTER TABLE laboratory.samplecategory ADD control boolean;
 UPDATE laboratory.samplecategory SET control = true;
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.279-12.280.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.279-12.280.sql
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.286-12.287.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.286-12.287.sql
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.296-12.297.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.296-12.297.sql
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.297-12.298.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.297-12.298.sql
diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.299-12.300.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.299-12.300.sql
