From c42e621a5e48307258882786e710a7cdb122255f Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 2 Jan 2026 17:39:21 -0800 Subject: [PATCH] Consolidate SQL scripts to *-0.000-25.000.sql --- .../EHR_ComplianceDB-12.20-12.30.sql | 6 - .../EHR_ComplianceDB-12.30-12.31.sql | 6 - .../EHR_ComplianceDB-12.31-12.32.sql | 6 - .../EHR_ComplianceDB-12.32-12.33.sql | 7 -- .../EHR_ComplianceDB-12.33-12.34.sql | 9 -- .../EHR_ComplianceDB-12.34-12.35.sql | 32 ------ .../EHR_ComplianceDB-12.35-12.36.sql | 6 - .../EHR_ComplianceDB-12.36-12.37.sql | 6 - .../EHR_ComplianceDB-12.37-12.38.sql | 18 --- .../EHR_ComplianceDB-12.38-12.39.sql | 1 - .../EHR_ComplianceDB-12.39-12.40.sql | 1 - .../EHR_ComplianceDB-12.40-12.41.sql | 22 ---- .../EHR_ComplianceDB-12.41-12.42.sql | 1 - .../EHR_ComplianceDB-12.42-12.43.sql | 12 -- .../EHR_ComplianceDB-12.43-12.44.sql | 1 - ....sql => ehr_compliancedb-0.000-25.000.sql} | 105 ++++++++++++++++- .../EHR_ComplianceDB-12.20-12.30.sql | 6 - .../EHR_ComplianceDB-12.30-12.31.sql | 6 - .../EHR_ComplianceDB-12.31-12.32.sql | 6 - .../EHR_ComplianceDB-12.32-12.33.sql | 7 -- .../EHR_ComplianceDB-12.33-12.34.sql | 9 -- .../EHR_ComplianceDB-12.34-12.35.sql | 32 ------ .../EHR_ComplianceDB-12.35-12.36.sql | 6 - .../EHR_ComplianceDB-12.36-12.37.sql | 6 - .../EHR_ComplianceDB-12.37-12.38.sql | 18 --- .../EHR_ComplianceDB-12.38-12.39.sql | 1 - .../EHR_ComplianceDB-12.39-12.40.sql | 2 - .../EHR_ComplianceDB-12.40-12.41.sql | 24 ---- .../EHR_ComplianceDB-12.41-12.42.sql | 1 - .../EHR_ComplianceDB-12.42-12.43.sql | 13 --- .../EHR_ComplianceDB-12.43-12.44.sql | 1 - ....sql => ehr_compliancedb-0.000-25.000.sql} | 107 +++++++++++++++++- ...-0.000-24.000.sql => ehr-0.000-25.000.sql} | 0 .../postgresql/ehr-24.000-24.001.sql | 17 --- ...3.000.sql => ehr_lookups-0.000-25.000.sql} | 12 +- .../postgresql/ehr_lookups-24.001-24.002.sql | 1 - .../postgresql/ehr_lookups-24.002-24.003.sql | 1 - .../postgresql/ehr_lookups-24.003-24.004.sql | 1 - .../postgresql/ehr_lookups-24.004-24.005.sql | 1 - ...-0.000-24.000.sql => ehr-0.000-25.000.sql} | 0 .../dbscripts/sqlserver/ehr-24.000-24.001.sql | 17 --- ...3.000.sql => ehr_lookups-0.000-25.000.sql} | 12 +- .../sqlserver/ehr_lookups-24.001-24.002.sql | 1 - .../sqlserver/ehr_lookups-24.002-24.003.sql | 1 - .../sqlserver/ehr_lookups-24.003-24.004.sql | 1 - .../sqlserver/ehr_lookups-24.004-24.005.sql | 1 - ...4.000.sql => ehr_billing-0.000-25.000.sql} | 0 .../postgresql/ehr_billing-24.000-24.001.sql | 20 ---- ...4.000.sql => ehr_billing-0.000-25.000.sql} | 0 .../sqlserver/ehr_billing-24.000-24.001.sql | 26 ----- ...-0.000-22.000.sql => snd-0.000-25.000.sql} | 103 +++++++++++++++++ .../dbscripts/sqlserver/snd-23.000-23.001.sql | 15 --- .../dbscripts/sqlserver/snd-23.001-23.003.sql | 2 - .../dbscripts/sqlserver/snd-23.003-23.004.sql | 1 - .../dbscripts/sqlserver/snd-23.004-23.005.sql | 80 ------------- 55 files changed, 335 insertions(+), 462 deletions(-) delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.20-12.30.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.30-12.31.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.31-12.32.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.32-12.33.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.33-12.34.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.34-12.35.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.35-12.36.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.36-12.37.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.37-12.38.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.38-12.39.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.39-12.40.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.41-12.42.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.42-12.43.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.43-12.44.sql rename EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/{EHR_ComplianceDB-0.00-11.20.sql => ehr_compliancedb-0.000-25.000.sql} (61%) delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.20-12.30.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.30-12.31.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.31-12.32.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.32-12.33.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.33-12.34.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.34-12.35.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.35-12.36.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.36-12.37.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.37-12.38.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.38-12.39.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.39-12.40.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.41-12.42.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.42-12.43.sql delete mode 100644 EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.43-12.44.sql rename EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/{EHR_ComplianceDB-0.00-11.20.sql => ehr_compliancedb-0.000-25.000.sql} (61%) rename ehr/resources/schemas/dbscripts/postgresql/{ehr-0.000-24.000.sql => ehr-0.000-25.000.sql} (100%) delete mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr-24.000-24.001.sql rename ehr/resources/schemas/dbscripts/postgresql/{ehr_lookups-0.000-23.000.sql => ehr_lookups-0.000-25.000.sql} (99%) delete mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.001-24.002.sql delete mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.002-24.003.sql delete mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.003-24.004.sql delete mode 100644 ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.004-24.005.sql rename ehr/resources/schemas/dbscripts/sqlserver/{ehr-0.000-24.000.sql => ehr-0.000-25.000.sql} (100%) delete mode 100644 ehr/resources/schemas/dbscripts/sqlserver/ehr-24.000-24.001.sql rename ehr/resources/schemas/dbscripts/sqlserver/{ehr_lookups-0.000-23.000.sql => ehr_lookups-0.000-25.000.sql} (99%) delete mode 100644 ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.001-24.002.sql delete mode 100644 ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.002-24.003.sql delete mode 100644 ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.003-24.004.sql delete mode 100644 ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.004-24.005.sql rename ehr_billing/resources/schemas/dbscripts/postgresql/{ehr_billing-0.000-24.000.sql => ehr_billing-0.000-25.000.sql} (100%) delete mode 100644 ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-24.000-24.001.sql rename ehr_billing/resources/schemas/dbscripts/sqlserver/{ehr_billing-0.000-24.000.sql => ehr_billing-0.000-25.000.sql} (100%) delete mode 100644 ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-24.000-24.001.sql rename snd/resources/schemas/dbscripts/sqlserver/{snd-0.000-22.000.sql => snd-0.000-25.000.sql} (94%) delete mode 100644 snd/resources/schemas/dbscripts/sqlserver/snd-23.000-23.001.sql delete mode 100644 snd/resources/schemas/dbscripts/sqlserver/snd-23.001-23.003.sql delete mode 100644 snd/resources/schemas/dbscripts/sqlserver/snd-23.003-23.004.sql delete mode 100644 snd/resources/schemas/dbscripts/sqlserver/snd-23.004-23.005.sql diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.20-12.30.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.20-12.30.sql deleted file mode 100644 index 6f0cb3f8b..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.20-12.30.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2012-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.requirements DROP container; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.30-12.31.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.30-12.31.sql deleted file mode 100644 index ccc81f29f..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.30-12.31.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.CompletionDates ADD trainer varchar(100); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.31-12.32.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.31-12.32.sql deleted file mode 100644 index 4eb52a13d..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.31-12.32.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.employees ADD middleName varchar(100); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.32-12.33.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.32-12.33.sql deleted file mode 100644 index efee76440..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.32-12.33.sql +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.employees ADD contactsSla bool default false; -ALTER TABLE ehr_compliancedb.requirements ADD contactsSla bool; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.33-12.34.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.33-12.34.sql deleted file mode 100644 index 6e39f73c9..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.33-12.34.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.requirements ADD container entityid; - ---upgrade of sorts. both wnprc/onprc should have a single container, so set container based on employees -UPDATE ehr_compliancedb.requirements SET container = (SELECT max(cast(c.container as varchar(38))) as container from ehr_compliancedb.employees c); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.34-12.35.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.34-12.35.sql deleted file mode 100644 index a222cb857..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.34-12.35.sql +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ ---delete potential orphans -DELETE FROM ehr_compliancedb.requirements WHERE container IS NULL OR (select entityid FROM core.containers WHERE entityid = container) IS NULL; - -ALTER TABLE ehr_compliancedb.requirements ADD rowid serial; - --- refactor foreign keys back into trigger scripts / java code. this was done b/c --- some tables are now scoped to a container, like requirements, and it is simply easier to enforce them from triggers than DB FKs -ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_employeeid; -ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_employeeid; -ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_requirementname; -ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_requirementname; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_type; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_category; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_title; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_unit; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_location; -ALTER TABLE ehr_compliancedb.requirements DROP CONSTRAINT fk_requirements_type; -ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_requirementname; -ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_category; -ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_unit; -ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_employeeid; -ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_requirementname; -ALTER TABLE ehr_compliancedb.sopbycategory DROP CONSTRAINT fk_sopbycategory_category; -ALTER TABLE ehr_compliancedb.sopdates DROP CONSTRAINT fk_sopdates_employeeid; - -SELECT core.fn_dropifexists('requirements', 'ehr_compliancedb', 'CONSTRAINT', 'PK_requirements'); -ALTER TABLE ehr_compliancedb.requirements ADD CONSTRAINT pk_requirements PRIMARY KEY (rowid); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.35-12.36.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.35-12.36.sql deleted file mode 100644 index ea4f9881c..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.35-12.36.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2014-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.requirements ADD datedisabled TIMESTAMP; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.36-12.37.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.36-12.37.sql deleted file mode 100644 index 4d3ec3cce..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.36-12.37.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2016-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.employeerequirementexemptions ADD COLUMN Comments varchar(500); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.37-12.38.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.37-12.38.sql deleted file mode 100644 index 4005a3370..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.37-12.38.sql +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2017-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ - -CREATE INDEX IX_completiondates_employeeid ON ehr_compliancedb.completiondates(employeeid); -CREATE INDEX IX_completiondates_requirementname ON ehr_compliancedb.completiondates(requirementname); - -CREATE INDEX IX_employeerequirementexemptions_employeeid ON ehr_compliancedb.employeerequirementexemptions(employeeid); -CREATE INDEX IX_employeerequirementexemptions_requirementname ON ehr_compliancedb.employeerequirementexemptions(requirementname); - -CREATE INDEX IX_requirementspercategory_requirementname ON ehr_compliancedb.requirementspercategory(requirementname); - -CREATE INDEX IX_requirementsperemployee_requirementname ON ehr_compliancedb.requirementsperemployee(requirementname); -CREATE INDEX IX_requirementsperemployee_employeeid ON ehr_compliancedb.requirementsperemployee(employeeid); - -CREATE INDEX IX_sopdates_employeeid ON ehr_compliancedb.sopdates(employeeid); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.38-12.39.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.38-12.39.sql deleted file mode 100644 index 230b83b76..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.38-12.39.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.CompletionDates ADD COLUMN FileName varchar(500); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.39-12.40.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.39-12.40.sql deleted file mode 100644 index 2ee05593c..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.39-12.40.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.Employees ALTER COLUMN Notes TYPE VARCHAR (4000); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql deleted file mode 100644 index 5c3400225..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.40-12.41.sql +++ /dev/null @@ -1,22 +0,0 @@ -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN trackingflag varchar(100); - -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN objectid ENTITYID; - -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN taskid ENTITYID; - -CREATE TABLE ehr_compliancedb.EmployeePerUnit -( - RowId SERIAL NOT NULL, - EmployeeId varchar(255) not null, - unit varchar(255) null, - category varchar(255) null, - Container ENTITYID NOT NULL, - CreatedBy USERID, - Created timestamp, - ModifiedBy USERID, - Modified timestamp, - taskid entityid, - objectid entityid, - - CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId) -); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.41-12.42.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.41-12.42.sql deleted file mode 100644 index 7f2b8c8c6..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.41-12.42.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.Requirements add reviewdate TIMESTAMP; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.42-12.43.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.42-12.43.sql deleted file mode 100644 index 9b965d343..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.42-12.43.sql +++ /dev/null @@ -1,12 +0,0 @@ -CREATE TABLE ehr_compliancedb.Compliance_Reference_Data -( - rowId SERIAL, - label varchar(250) NULL, - value varchar(255), - columnName varchar(255) NOT NULL, - sort_order integer NULL, - endDate TIMESTAMP NULL, - objectid entityid, - - CONSTRAINT pk_compliance_reference PRIMARY KEY (value) -); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.43-12.44.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.43-12.44.sql deleted file mode 100644 index 67724c751..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-12.43-12.44.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.CompletionDates ADD snooze_date TIMESTAMP; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-0.00-11.20.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/ehr_compliancedb-0.000-25.000.sql similarity index 61% rename from EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-0.00-11.20.sql rename to EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/ehr_compliancedb-0.000-25.000.sql index 9ef00e6e0..cd8ed2981 100644 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/EHR_ComplianceDB-0.00-11.20.sql +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/postgresql/ehr_compliancedb-0.000-25.000.sql @@ -304,4 +304,107 @@ ALTER TABLE ehr_compliancedb.sopbycategory ALTER TABLE ehr_compliancedb.sopdates ADD CONSTRAINT fk_sopdates_employeeid FOREIGN KEY (employeeid) REFERENCES ehr_compliancedb.employees (employeeid) - ON UPDATE CASCADE; \ No newline at end of file + ON UPDATE CASCADE; + +ALTER TABLE ehr_compliancedb.requirements DROP container; + +ALTER TABLE ehr_compliancedb.CompletionDates ADD trainer varchar(100); + +ALTER TABLE ehr_compliancedb.employees ADD middleName varchar(100); + +ALTER TABLE ehr_compliancedb.employees ADD contactsSla bool default false; +ALTER TABLE ehr_compliancedb.requirements ADD contactsSla bool; + +ALTER TABLE ehr_compliancedb.requirements ADD container entityid; + +--upgrade of sorts. both wnprc/onprc should have a single container, so set container based on employees +UPDATE ehr_compliancedb.requirements SET container = (SELECT max(cast(c.container as varchar(38))) as container from ehr_compliancedb.employees c); + +--delete potential orphans +DELETE FROM ehr_compliancedb.requirements WHERE container IS NULL OR (select entityid FROM core.containers WHERE entityid = container) IS NULL; + +ALTER TABLE ehr_compliancedb.requirements ADD rowid serial; + +-- refactor foreign keys back into trigger scripts / java code. this was done b/c +-- some tables are now scoped to a container, like requirements, and it is simply easier to enforce them from triggers than DB FKs +ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_employeeid; +ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_employeeid; +ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_requirementname; +ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_requirementname; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_type; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_category; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_title; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_unit; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_location; +ALTER TABLE ehr_compliancedb.requirements DROP CONSTRAINT fk_requirements_type; +ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_requirementname; +ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_category; +ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_unit; +ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_employeeid; +ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_requirementname; +ALTER TABLE ehr_compliancedb.sopbycategory DROP CONSTRAINT fk_sopbycategory_category; +ALTER TABLE ehr_compliancedb.sopdates DROP CONSTRAINT fk_sopdates_employeeid; + +SELECT core.fn_dropifexists('requirements', 'ehr_compliancedb', 'CONSTRAINT', 'PK_requirements'); +ALTER TABLE ehr_compliancedb.requirements ADD CONSTRAINT pk_requirements PRIMARY KEY (rowid); + +ALTER TABLE ehr_compliancedb.requirements ADD datedisabled TIMESTAMP; + +ALTER TABLE ehr_compliancedb.employeerequirementexemptions ADD COLUMN Comments varchar(500); + +CREATE INDEX IX_completiondates_employeeid ON ehr_compliancedb.completiondates(employeeid); +CREATE INDEX IX_completiondates_requirementname ON ehr_compliancedb.completiondates(requirementname); + +CREATE INDEX IX_employeerequirementexemptions_employeeid ON ehr_compliancedb.employeerequirementexemptions(employeeid); +CREATE INDEX IX_employeerequirementexemptions_requirementname ON ehr_compliancedb.employeerequirementexemptions(requirementname); + +CREATE INDEX IX_requirementspercategory_requirementname ON ehr_compliancedb.requirementspercategory(requirementname); + +CREATE INDEX IX_requirementsperemployee_requirementname ON ehr_compliancedb.requirementsperemployee(requirementname); +CREATE INDEX IX_requirementsperemployee_employeeid ON ehr_compliancedb.requirementsperemployee(employeeid); + +CREATE INDEX IX_sopdates_employeeid ON ehr_compliancedb.sopdates(employeeid); + +ALTER TABLE ehr_compliancedb.CompletionDates ADD COLUMN FileName varchar(500); + +ALTER TABLE ehr_compliancedb.Employees ALTER COLUMN Notes TYPE VARCHAR (4000); + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN trackingflag varchar(100); + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN objectid ENTITYID; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add COLUMN taskid ENTITYID; + +CREATE TABLE ehr_compliancedb.EmployeePerUnit +( + RowId SERIAL NOT NULL, + EmployeeId varchar(255) not null, + unit varchar(255) null, + category varchar(255) null, + Container ENTITYID NOT NULL, + CreatedBy USERID, + Created timestamp, + ModifiedBy USERID, + Modified timestamp, + taskid entityid, + objectid entityid, + + CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId) +); + +ALTER TABLE ehr_compliancedb.Requirements add reviewdate TIMESTAMP; + +CREATE TABLE ehr_compliancedb.Compliance_Reference_Data +( + rowId SERIAL, + label varchar(250) NULL, + value varchar(255), + columnName varchar(255) NOT NULL, + sort_order integer NULL, + endDate TIMESTAMP NULL, + objectid entityid, + + CONSTRAINT pk_compliance_reference PRIMARY KEY (value) +); + +ALTER TABLE ehr_compliancedb.CompletionDates ADD snooze_date TIMESTAMP; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.20-12.30.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.20-12.30.sql deleted file mode 100644 index 9312f1ef7..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.20-12.30.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2012-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.requirements DROP column container; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.30-12.31.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.30-12.31.sql deleted file mode 100644 index ccc81f29f..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.30-12.31.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.CompletionDates ADD trainer varchar(100); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.31-12.32.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.31-12.32.sql deleted file mode 100644 index 4eb52a13d..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.31-12.32.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.employees ADD middleName varchar(100); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.32-12.33.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.32-12.33.sql deleted file mode 100644 index c91eb7ca6..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.32-12.33.sql +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.employees ADD contactsSla bit default 0; -ALTER TABLE ehr_compliancedb.requirements ADD contactsSla bit; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.33-12.34.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.33-12.34.sql deleted file mode 100644 index e6d298e25..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.33-12.34.sql +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.requirements ADD container entityid; -GO ---upgrade of sorts. both wnprc/onprc should have a single container, so set container based on employees -UPDATE ehr_compliancedb.requirements SET container = (SELECT max(cast(c.container as varchar(38))) as container from ehr_compliancedb.employees c); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.34-12.35.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.34-12.35.sql deleted file mode 100644 index ba892d96a..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.34-12.35.sql +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2013-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ ---delete potential orphans -DELETE FROM ehr_compliancedb.requirements WHERE container IS NULL OR (select entityid FROM core.containers WHERE entityid = container) IS NULL; - -ALTER TABLE ehr_compliancedb.requirements ADD rowid int identity(1,1); - --- refactor foreign keys back into trigger scripts / java code. this was done b/c --- some tables are now scoped to a container, like requirements, and it is simply easier to enforce them from triggers than DB FKs -ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_employeeid; -ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_employeeid; -ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_requirementname; -ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_requirementname; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_type; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_category; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_title; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_unit; -ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_location; -ALTER TABLE ehr_compliancedb.requirements DROP CONSTRAINT fk_requirements_type; -ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_requirementname; -ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_category; -ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_unit; -ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_employeeid; -ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_requirementname; -ALTER TABLE ehr_compliancedb.sopbycategory DROP CONSTRAINT fk_sopbycategory_category; -ALTER TABLE ehr_compliancedb.sopdates DROP CONSTRAINT fk_sopdates_employeeid; - -EXEC core.fn_dropifexists 'requirements', 'ehr_compliancedb', 'CONSTRAINT', 'PK_requirements'; -ALTER TABLE ehr_compliancedb.requirements ADD CONSTRAINT pk_requirements PRIMARY KEY (rowid); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.35-12.36.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.35-12.36.sql deleted file mode 100644 index d19ac1c39..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.35-12.36.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2014-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.requirements ADD datedisabled DATETIME; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.36-12.37.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.36-12.37.sql deleted file mode 100644 index 406008d12..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.36-12.37.sql +++ /dev/null @@ -1,6 +0,0 @@ -/* - * Copyright (c) 2016-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ -ALTER TABLE ehr_compliancedb.employeerequirementexemptions ADD Comments varchar(500); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.37-12.38.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.37-12.38.sql deleted file mode 100644 index 4005a3370..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.37-12.38.sql +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) 2017-2019 LabKey Corporation - * - * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0 - */ - -CREATE INDEX IX_completiondates_employeeid ON ehr_compliancedb.completiondates(employeeid); -CREATE INDEX IX_completiondates_requirementname ON ehr_compliancedb.completiondates(requirementname); - -CREATE INDEX IX_employeerequirementexemptions_employeeid ON ehr_compliancedb.employeerequirementexemptions(employeeid); -CREATE INDEX IX_employeerequirementexemptions_requirementname ON ehr_compliancedb.employeerequirementexemptions(requirementname); - -CREATE INDEX IX_requirementspercategory_requirementname ON ehr_compliancedb.requirementspercategory(requirementname); - -CREATE INDEX IX_requirementsperemployee_requirementname ON ehr_compliancedb.requirementsperemployee(requirementname); -CREATE INDEX IX_requirementsperemployee_employeeid ON ehr_compliancedb.requirementsperemployee(employeeid); - -CREATE INDEX IX_sopdates_employeeid ON ehr_compliancedb.sopdates(employeeid); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.38-12.39.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.38-12.39.sql deleted file mode 100644 index ca7d99334..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.38-12.39.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.CompletionDates ADD FileName nvarchar(500); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.39-12.40.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.39-12.40.sql deleted file mode 100644 index 088f94886..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.39-12.40.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE ehr_compliancedb.Employees ALTER COLUMN Notes NVARCHAR (4000); - diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql deleted file mode 100644 index 434f06971..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.40-12.41.sql +++ /dev/null @@ -1,24 +0,0 @@ - -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag nvarchar(100); - -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid ENTITYID; - -ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid ENTITYID; - - -CREATE TABLE ehr_compliancedb.EmployeePerUnit -( - RowId INT IDENTITY(1,1) NOT NULL, - EmployeeId nvarchar(255) not null, - unit nvarchar(255) null, - category nvarchar(255) null, - Container ENTITYID NOT NULL, - CreatedBy USERID, - Created datetime, - ModifiedBy USERID, - Modified datetime, - taskid entityid, - objectid entityid - - CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId) -); diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.41-12.42.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.41-12.42.sql deleted file mode 100644 index e7be62f10..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.41-12.42.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.Requirements add reviewdate datetime; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.42-12.43.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.42-12.43.sql deleted file mode 100644 index f0986a44e..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.42-12.43.sql +++ /dev/null @@ -1,13 +0,0 @@ -CREATE TABLE ehr_compliancedb.Compliance_Reference_Data -( - rowId int identity(1,1), - label varchar(250) NULL, - value varchar(255) , - columnName varchar(255) NOT NULL, - sort_order integer null, - endDate datetime NULL, - objectid entityid - - CONSTRAINT pk_compliance_reference PRIMARY KEY (value) - -); \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.43-12.44.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.43-12.44.sql deleted file mode 100644 index c5e4bf8ec..000000000 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-12.43-12.44.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_compliancedb.CompletionDates ADD snooze_date datetime; \ No newline at end of file diff --git a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-0.00-11.20.sql b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/ehr_compliancedb-0.000-25.000.sql similarity index 61% rename from EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-0.00-11.20.sql rename to EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/ehr_compliancedb-0.000-25.000.sql index aaff37257..d12cf0b76 100644 --- a/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/EHR_ComplianceDB-0.00-11.20.sql +++ b/EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/ehr_compliancedb-0.000-25.000.sql @@ -318,4 +318,109 @@ ALTER TABLE ehr_compliancedb.sopbycategory ALTER TABLE ehr_compliancedb.sopdates ADD CONSTRAINT fk_sopdates_employeeid FOREIGN KEY (employeeid) REFERENCES ehr_compliancedb.employees (employeeid) - ON UPDATE CASCADE; \ No newline at end of file + ON UPDATE CASCADE; + +ALTER TABLE ehr_compliancedb.requirements DROP column container; + +ALTER TABLE ehr_compliancedb.CompletionDates ADD trainer varchar(100); + +ALTER TABLE ehr_compliancedb.employees ADD middleName varchar(100); + +ALTER TABLE ehr_compliancedb.employees ADD contactsSla bit default 0; +ALTER TABLE ehr_compliancedb.requirements ADD contactsSla bit; + +ALTER TABLE ehr_compliancedb.requirements ADD container entityid; +GO +--upgrade of sorts. both wnprc/onprc should have a single container, so set container based on employees +UPDATE ehr_compliancedb.requirements SET container = (SELECT max(cast(c.container as varchar(38))) as container from ehr_compliancedb.employees c); + +--delete potential orphans +DELETE FROM ehr_compliancedb.requirements WHERE container IS NULL OR (select entityid FROM core.containers WHERE entityid = container) IS NULL; + +ALTER TABLE ehr_compliancedb.requirements ADD rowid int identity(1,1); + +-- refactor foreign keys back into trigger scripts / java code. this was done b/c +-- some tables are now scoped to a container, like requirements, and it is simply easier to enforce them from triggers than DB FKs +ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_employeeid; +ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_employeeid; +ALTER TABLE ehr_compliancedb.completiondates DROP CONSTRAINT fk_completiondates_requirementname; +ALTER TABLE ehr_compliancedb.employeerequirementexemptions DROP CONSTRAINT fk_employeerequirementexemptions_requirementname; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_type; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_category; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_title; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_unit; +ALTER TABLE ehr_compliancedb.employees DROP CONSTRAINT fk_employees_location; +ALTER TABLE ehr_compliancedb.requirements DROP CONSTRAINT fk_requirements_type; +ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_requirementname; +ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_category; +ALTER TABLE ehr_compliancedb.requirementspercategory DROP CONSTRAINT fk_requirementspercategory_unit; +ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_employeeid; +ALTER TABLE ehr_compliancedb.requirementsperemployee DROP CONSTRAINT fk_requirementsperemployee_requirementname; +ALTER TABLE ehr_compliancedb.sopbycategory DROP CONSTRAINT fk_sopbycategory_category; +ALTER TABLE ehr_compliancedb.sopdates DROP CONSTRAINT fk_sopdates_employeeid; + +EXEC core.fn_dropifexists 'requirements', 'ehr_compliancedb', 'CONSTRAINT', 'PK_requirements'; +ALTER TABLE ehr_compliancedb.requirements ADD CONSTRAINT pk_requirements PRIMARY KEY (rowid); + +ALTER TABLE ehr_compliancedb.requirements ADD datedisabled DATETIME; + +ALTER TABLE ehr_compliancedb.employeerequirementexemptions ADD Comments varchar(500); + +CREATE INDEX IX_completiondates_employeeid ON ehr_compliancedb.completiondates(employeeid); +CREATE INDEX IX_completiondates_requirementname ON ehr_compliancedb.completiondates(requirementname); + +CREATE INDEX IX_employeerequirementexemptions_employeeid ON ehr_compliancedb.employeerequirementexemptions(employeeid); +CREATE INDEX IX_employeerequirementexemptions_requirementname ON ehr_compliancedb.employeerequirementexemptions(requirementname); + +CREATE INDEX IX_requirementspercategory_requirementname ON ehr_compliancedb.requirementspercategory(requirementname); + +CREATE INDEX IX_requirementsperemployee_requirementname ON ehr_compliancedb.requirementsperemployee(requirementname); +CREATE INDEX IX_requirementsperemployee_employeeid ON ehr_compliancedb.requirementsperemployee(employeeid); + +CREATE INDEX IX_sopdates_employeeid ON ehr_compliancedb.sopdates(employeeid); + +ALTER TABLE ehr_compliancedb.CompletionDates ADD FileName nvarchar(500); + +ALTER TABLE ehr_compliancedb.Employees ALTER COLUMN Notes NVARCHAR (4000); + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add trackingflag nvarchar(100); + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add objectid ENTITYID; + +ALTER TABLE ehr_compliancedb.RequirementsPerCategory add taskid ENTITYID; + + +CREATE TABLE ehr_compliancedb.EmployeePerUnit +( + RowId INT IDENTITY(1,1) NOT NULL, + EmployeeId nvarchar(255) not null, + unit nvarchar(255) null, + category nvarchar(255) null, + Container ENTITYID NOT NULL, + CreatedBy USERID, + Created datetime, + ModifiedBy USERID, + Modified datetime, + taskid entityid, + objectid entityid + + CONSTRAINT PK_EmployeePerUnits PRIMARY KEY (RowId) +); + +ALTER TABLE ehr_compliancedb.Requirements add reviewdate datetime; + +CREATE TABLE ehr_compliancedb.Compliance_Reference_Data +( + rowId int identity(1,1), + label varchar(250) NULL, + value varchar(255) , + columnName varchar(255) NOT NULL, + sort_order integer null, + endDate datetime NULL, + objectid entityid + + CONSTRAINT pk_compliance_reference PRIMARY KEY (value) + +); + +ALTER TABLE ehr_compliancedb.CompletionDates ADD snooze_date datetime; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr-0.000-24.000.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr-0.000-25.000.sql similarity index 100% rename from ehr/resources/schemas/dbscripts/postgresql/ehr-0.000-24.000.sql rename to ehr/resources/schemas/dbscripts/postgresql/ehr-0.000-25.000.sql diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr-24.000-24.001.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr-24.000-24.001.sql deleted file mode 100644 index a3003b9cb..000000000 --- a/ehr/resources/schemas/dbscripts/postgresql/ehr-24.000-24.001.sql +++ /dev/null @@ -1,17 +0,0 @@ -CREATE FUNCTION ehr.handleUpgrade() RETURNS VOID AS $$ -DECLARE -BEGIN - IF NOT EXISTS ( - SELECT column_name - FROM information_schema.columns - WHERE table_name='notificationrecipients' and table_schema='ehr' and column_name='lsid' - ) - THEN - ALTER TABLE ehr.notificationrecipients ADD COLUMN LSID LSIDtype; - END IF; -END; -$$ LANGUAGE plpgsql; - -SELECT ehr.handleUpgrade(); - -DROP FUNCTION ehr.handleUpgrade(); \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.000-23.000.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.000-25.000.sql similarity index 99% rename from ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.000-23.000.sql rename to ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.000-25.000.sql index fbf5c7e37..eed17733a 100644 --- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.000-23.000.sql +++ b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-0.000-25.000.sql @@ -10154,4 +10154,14 @@ CREATE INDEX IX_Ehr_Lookups_Floors_Container ON ehr_lookups.floors (Container); --Added new column called "PainCategories" to record the USDA pain levels. --EHR tkt # 8782 -ALTER TABLE ehr_lookups.procedures ADD COLUMN painCategories varchar(50); \ No newline at end of file +ALTER TABLE ehr_lookups.procedures ADD COLUMN painCategories varchar(50); + +/* 24.xxx SQL scripts */ + +ALTER TABLE ehr_lookups.lab_tests ADD COLUMN LSID LSIDtype; + +ALTER TABLE ehr_lookups.species ADD COLUMN isNHP BOOLEAN DEFAULT TRUE; + +ALTER TABLE ehr_lookups.species ADD blood_threshold_warning double precision; + +ALTER TABLE ehr_lookups.cage_type ADD COLUMN LSID LSIDtype; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.001-24.002.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.001-24.002.sql deleted file mode 100644 index 63eba2bfc..000000000 --- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.001-24.002.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.lab_tests ADD COLUMN LSID LSIDtype; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.002-24.003.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.002-24.003.sql deleted file mode 100644 index 9b390e819..000000000 --- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.002-24.003.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.species ADD COLUMN isNHP BOOLEAN DEFAULT TRUE; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.003-24.004.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.003-24.004.sql deleted file mode 100644 index bd82819c7..000000000 --- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.003-24.004.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.species ADD blood_threshold_warning double precision; diff --git a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.004-24.005.sql b/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.004-24.005.sql deleted file mode 100644 index 230af657f..000000000 --- a/ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-24.004-24.005.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.cage_type ADD COLUMN LSID LSIDtype; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr-0.000-24.000.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr-0.000-25.000.sql similarity index 100% rename from ehr/resources/schemas/dbscripts/sqlserver/ehr-0.000-24.000.sql rename to ehr/resources/schemas/dbscripts/sqlserver/ehr-0.000-25.000.sql diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr-24.000-24.001.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr-24.000-24.001.sql deleted file mode 100644 index 4cee5962a..000000000 --- a/ehr/resources/schemas/dbscripts/sqlserver/ehr-24.000-24.001.sql +++ /dev/null @@ -1,17 +0,0 @@ -CREATE PROCEDURE ehr.handleUpgrade AS -BEGIN - IF NOT EXISTS(SELECT column_name - FROM information_schema.columns - WHERE table_name='notificationrecipients' and table_schema='ehr' and column_name='lsid') -BEGIN - -ALTER TABLE ehr.notificationrecipients ADD Lsid LsidType null; -END -END; -GO - -EXEC ehr.handleUpgrade -GO - -DROP PROCEDURE ehr.handleUpgrade - GO \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.000-23.000.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.000-25.000.sql similarity index 99% rename from ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.000-23.000.sql rename to ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.000-25.000.sql index 741174e09..2bc0d7ba1 100644 --- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.000-23.000.sql +++ b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-0.000-25.000.sql @@ -10603,4 +10603,14 @@ CREATE INDEX IX_Ehr_Lookups_Floors_Container ON ehr_lookups.floors (Container); --Added new column called "PainCategories" to record the USDA pain levels. --EHR tkt # 8782 -ALTER TABLE ehr_lookups.procedures ADD painCategories NVARCHAR(50); \ No newline at end of file +ALTER TABLE ehr_lookups.procedures ADD painCategories NVARCHAR(50); + +/* 24.xxx SQL scripts */ + +ALTER TABLE ehr_lookups.lab_tests ADD Lsid LsidType null; + +ALTER TABLE ehr_lookups.species ADD isNHP BIT DEFAULT 1; + +ALTER TABLE ehr_lookups.species ADD blood_threshold_warning double precision; + +ALTER TABLE ehr_lookups.cage_type ADD Lsid LsidType null; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.001-24.002.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.001-24.002.sql deleted file mode 100644 index 3d4cc0c43..000000000 --- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.001-24.002.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.lab_tests ADD Lsid LsidType null; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.002-24.003.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.002-24.003.sql deleted file mode 100644 index 642023a10..000000000 --- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.002-24.003.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.species ADD isNHP BIT DEFAULT 1; \ No newline at end of file diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.003-24.004.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.003-24.004.sql deleted file mode 100644 index bd82819c7..000000000 --- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.003-24.004.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.species ADD blood_threshold_warning double precision; diff --git a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.004-24.005.sql b/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.004-24.005.sql deleted file mode 100644 index f6a400223..000000000 --- a/ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-24.004-24.005.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE ehr_lookups.cage_type ADD Lsid LsidType null; \ No newline at end of file diff --git a/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-0.000-24.000.sql b/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-0.000-25.000.sql similarity index 100% rename from ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-0.000-24.000.sql rename to ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-0.000-25.000.sql diff --git a/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-24.000-24.001.sql b/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-24.000-24.001.sql deleted file mode 100644 index 9843409b3..000000000 --- a/ehr_billing/resources/schemas/dbscripts/postgresql/ehr_billing-24.000-24.001.sql +++ /dev/null @@ -1,20 +0,0 @@ --- this table should consists of the rows with schema name, query name where the resulting rows of that query are associated with a chargeId, chargeId, and description of the query -CREATE TABLE IF NOT EXISTS ehr_billing.procedureQueryChargeIdAssoc ( - - rowId SERIAL NOT NULL, - schemaName varchar(200) NOT NULL, - queryName varchar(500) NOT NULL, - description varchar(2000) NOT NULL, - chargeId int NOT NULL, - - container ENTITYID NOT NULL, - createdBy USERID, - created timestamp, - modifiedBy USERID, - modified timestamp, - - CONSTRAINT PK_procedureQueryChargeIdAssociations PRIMARY KEY (rowId), - CONSTRAINT FK_EHR_BILLING_PROCEDURE_QUERY_CHARGEID_ASSOC_CONTAINER FOREIGN KEY (container) REFERENCES core.Containers (EntityId) - ); - -CREATE INDEX IF NOT EXISTS IDX_EHR_BILLING_PROCEDURE_QUERY_CHARGEID_ASSOC_CONTAINER ON ehr_billing.procedureQueryChargeIdAssoc (container); \ No newline at end of file diff --git a/ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-0.000-24.000.sql b/ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-0.000-25.000.sql similarity index 100% rename from ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-0.000-24.000.sql rename to ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-0.000-25.000.sql diff --git a/ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-24.000-24.001.sql b/ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-24.000-24.001.sql deleted file mode 100644 index b88987990..000000000 --- a/ehr_billing/resources/schemas/dbscripts/sqlserver/ehr_billing-24.000-24.001.sql +++ /dev/null @@ -1,26 +0,0 @@ -IF OBJECT_ID(N'ehr_billing.procedureQueryChargeIdAssoc', N'U') IS NULL - BEGIN - CREATE TABLE ehr_billing.procedureQueryChargeIdAssoc ( - rowId INT IDENTITY(1,1) NOT NULL, - schemaName nvarchar(200) NOT NULL, - queryName nvarchar(500) NOT NULL, - description nvarchar(2000) NOT NULL, - chargeId int NOT NULL, - - container ENTITYID NOT NULL, - createdBy USERID, - created DATETIME, - modifiedBy USERID, - modified DATETIME, - - CONSTRAINT PK_procedureQueryChargeIdAssociations PRIMARY KEY (rowId), - CONSTRAINT FK_EHR_BILLING_PROCEDURE_QUERY_CHARGEID_ASSOC_CONTAINER FOREIGN KEY (Container) REFERENCES core.Containers (EntityId) - ); - END; -GO - -IF NOT EXISTS(SELECT * FROM sys.indexes WHERE name = 'IDX_EHR_BILLING_PROCEDURE_QUERY_CHARGEID_ASSOC_CONTAINER' AND object_id = OBJECT_ID('ehr_billing.procedureQueryChargeIdAssoc')) -BEGIN -CREATE INDEX IDX_EHR_BILLING_PROCEDURE_QUERY_CHARGEID_ASSOC_CONTAINER ON ehr_billing.procedureQueryChargeIdAssoc (container); -END; -GO \ No newline at end of file diff --git a/snd/resources/schemas/dbscripts/sqlserver/snd-0.000-22.000.sql b/snd/resources/schemas/dbscripts/sqlserver/snd-0.000-25.000.sql similarity index 94% rename from snd/resources/schemas/dbscripts/sqlserver/snd-0.000-22.000.sql rename to snd/resources/schemas/dbscripts/sqlserver/snd-0.000-25.000.sql index 419600efd..9ba2bdd02 100644 --- a/snd/resources/schemas/dbscripts/sqlserver/snd-0.000-22.000.sql +++ b/snd/resources/schemas/dbscripts/sqlserver/snd-0.000-25.000.sql @@ -998,4 +998,107 @@ SET QcState = (SELECT TOP(1) q.rowId FROM core.DataStates AS q WHERE q.Label = ' INNER JOIN snd.Events AS e ON i.EventId = e.EventId WHERE i.QcState IS NULL END +GO + +/* 23.xxx SQL scripts */ + +ALTER TRIGGER snd.ti_after_Events ON snd.Events FOR INSERT AS +BEGIN + SET NOCOUNT ON; + DECLARE + @Container ENTITYID + + SELECT @Container = INSERTED.[Container] FROM INSERTED +UPDATE snd.Events +SET QcState = (SELECT TOP(1) q.rowId FROM core.DataStates AS q WHERE q.Label = 'Completed' AND q.Container = @Container ORDER BY q.rowId) + FROM INSERTED AS i + INNER JOIN snd.Events AS e ON i.EventId = e.EventId +WHERE i.QcState IS NULL +END +GO + +CREATE UNIQUE INDEX IDX_LookupSets_SetName +ON snd.LookupSets (SetName) + +ALTER TABLE snd.EventData ADD SortOrder INTEGER NULL; + +EXEC core.fn_dropifexists 'fGetAllSuperPkgs', 'snd', 'function'; +go + +CREATE FUNCTION snd.fGetAllSuperPkgs +() +RETURNS @expandedSuperPackages TABLE +( + TopLevelPkgId INTEGER NOT NULL, + SuperPkgId INTEGER NOT NULL, + ParentSuperPkgId INTEGER NULL, + PkgId INTEGER NOT NULL, + TreePath VARCHAR(MAX) NOT NULL, + SuperPkgPath INTEGER NOT NULL, + SortOrder INTEGER NULL, + Required INTEGER NULL, + DESCRIPTION VARCHAR(MAX) NOT NULL, + Narrative VARCHAR(MAX) NOT NULL, + Active INTEGER NOT NULL, + Repeatable INTEGER NOT NULL, + Level INTEGER NOT NULL +) +AS +BEGIN + DECLARE @loopCursor CURSOR; + DECLARE @topLevelPkgId INTEGER; + + SET @loopCursor = CURSOR LOCAL FOR +SELECT PkgId AS topLevelPackageId +FROM snd.SuperPkgs AS tl +WHERE ParentSuperPkgId IS NULL + FOR READ ONLY; + +OPEN @loopCursor; +FETCH @loopCursor + INTO @topLevelPkgId; + +WHILE (@@FETCH_STATUS = 0) +BEGIN +INSERT INTO @expandedSuperPackages +( + TopLevelPkgId, + SuperPkgId, + ParentSuperPkgId, + PkgId, + TreePath, + SuperPkgPath, + SortOrder, + Required, + DESCRIPTION, + Narrative, + Active, + Repeatable, + Level +) + (SELECT TopLevelPkgId, + SuperPkgId, + ParentSuperPkgId, + PkgId, + TreePath, + SuperPkgPath, + SortOrder, + Required, + Description, + Narrative, + Active, + Repeatable, + Level + FROM snd.fGetSuperPkg(@topLevelPkgId) ); + +FETCH NEXT FROM @loopCursor + INTO @topLevelPkgId; + +END; -- WHILE LOOP + +CLOSE @loopCursor; +DEALLOCATE @loopCursor; + + RETURN; +END; GO \ No newline at end of file diff --git a/snd/resources/schemas/dbscripts/sqlserver/snd-23.000-23.001.sql b/snd/resources/schemas/dbscripts/sqlserver/snd-23.000-23.001.sql deleted file mode 100644 index b19de0ac5..000000000 --- a/snd/resources/schemas/dbscripts/sqlserver/snd-23.000-23.001.sql +++ /dev/null @@ -1,15 +0,0 @@ - -ALTER TRIGGER snd.ti_after_Events ON snd.Events FOR INSERT AS -BEGIN - SET NOCOUNT ON; - DECLARE - @Container ENTITYID - - SELECT @Container = INSERTED.[Container] FROM INSERTED -UPDATE snd.Events -SET QcState = (SELECT TOP(1) q.rowId FROM core.DataStates AS q WHERE q.Label = 'Completed' AND q.Container = @Container ORDER BY q.rowId) - FROM INSERTED AS i - INNER JOIN snd.Events AS e ON i.EventId = e.EventId -WHERE i.QcState IS NULL -END -GO \ No newline at end of file diff --git a/snd/resources/schemas/dbscripts/sqlserver/snd-23.001-23.003.sql b/snd/resources/schemas/dbscripts/sqlserver/snd-23.001-23.003.sql deleted file mode 100644 index 092957346..000000000 --- a/snd/resources/schemas/dbscripts/sqlserver/snd-23.001-23.003.sql +++ /dev/null @@ -1,2 +0,0 @@ -CREATE UNIQUE INDEX IDX_LookupSets_SetName -ON snd.LookupSets (SetName) \ No newline at end of file diff --git a/snd/resources/schemas/dbscripts/sqlserver/snd-23.003-23.004.sql b/snd/resources/schemas/dbscripts/sqlserver/snd-23.003-23.004.sql deleted file mode 100644 index 06654e22f..000000000 --- a/snd/resources/schemas/dbscripts/sqlserver/snd-23.003-23.004.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE snd.EventData ADD SortOrder INTEGER NULL; \ No newline at end of file diff --git a/snd/resources/schemas/dbscripts/sqlserver/snd-23.004-23.005.sql b/snd/resources/schemas/dbscripts/sqlserver/snd-23.004-23.005.sql deleted file mode 100644 index b12a84263..000000000 --- a/snd/resources/schemas/dbscripts/sqlserver/snd-23.004-23.005.sql +++ /dev/null @@ -1,80 +0,0 @@ -EXEC core.fn_dropifexists 'fGetAllSuperPkgs', 'snd', 'function'; -go - -CREATE FUNCTION snd.fGetAllSuperPkgs -() -RETURNS @expandedSuperPackages TABLE -( - TopLevelPkgId INTEGER NOT NULL, - SuperPkgId INTEGER NOT NULL, - ParentSuperPkgId INTEGER NULL, - PkgId INTEGER NOT NULL, - TreePath VARCHAR(MAX) NOT NULL, - SuperPkgPath INTEGER NOT NULL, - SortOrder INTEGER NULL, - Required INTEGER NULL, - DESCRIPTION VARCHAR(MAX) NOT NULL, - Narrative VARCHAR(MAX) NOT NULL, - Active INTEGER NOT NULL, - Repeatable INTEGER NOT NULL, - Level INTEGER NOT NULL -) -AS -BEGIN - DECLARE @loopCursor CURSOR; - DECLARE @topLevelPkgId INTEGER; - - SET @loopCursor = CURSOR LOCAL FOR -SELECT PkgId AS topLevelPackageId -FROM snd.SuperPkgs AS tl -WHERE ParentSuperPkgId IS NULL - FOR READ ONLY; - -OPEN @loopCursor; -FETCH @loopCursor - INTO @topLevelPkgId; - -WHILE (@@FETCH_STATUS = 0) -BEGIN -INSERT INTO @expandedSuperPackages -( - TopLevelPkgId, - SuperPkgId, - ParentSuperPkgId, - PkgId, - TreePath, - SuperPkgPath, - SortOrder, - Required, - DESCRIPTION, - Narrative, - Active, - Repeatable, - Level -) - (SELECT TopLevelPkgId, - SuperPkgId, - ParentSuperPkgId, - PkgId, - TreePath, - SuperPkgPath, - SortOrder, - Required, - Description, - Narrative, - Active, - Repeatable, - Level - FROM snd.fGetSuperPkg(@topLevelPkgId) ); - -FETCH NEXT FROM @loopCursor - INTO @topLevelPkgId; - -END; -- WHILE LOOP - -CLOSE @loopCursor; -DEALLOCATE @loopCursor; - - RETURN; -END; -GO