From 07b249e28874cc9d865088c45f9857c9223891f2 Mon Sep 17 00:00:00 2001 From: bbimber Date: Wed, 2 Apr 2025 10:35:59 -0700 Subject: [PATCH] Make SQL select more specific (#237) (#238) --- .../schemas/dbscripts/postgresql/laboratory-12.305-12.306.sql | 2 +- .../schemas/dbscripts/sqlserver/laboratory-12.305-12.306.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.305-12.306.sql b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.305-12.306.sql index df0e0a4b..880669e6 100644 --- a/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.305-12.306.sql +++ b/laboratory/resources/schemas/dbscripts/postgresql/laboratory-12.305-12.306.sql @@ -5,7 +5,7 @@ ALTER TABLE laboratory.species ADD createdby int; ALTER TABLE laboratory.species ADD modified timestamp; ALTER TABLE laboratory.species ADD modifiedby int; -UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers WHERE name = 'Shared'); +UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers c1 WHERE name = 'Shared' and (select parent from core.Containers c2 where c2.EntityId = c1.Parent) is null); ALTER TABLE laboratory.species DROP CONSTRAINT PK_species; ALTER TABLE laboratory.species ADD CONSTRAINT PK_species PRIMARY KEY (rowid); \ No newline at end of file diff --git a/laboratory/resources/schemas/dbscripts/sqlserver/laboratory-12.305-12.306.sql b/laboratory/resources/schemas/dbscripts/sqlserver/laboratory-12.305-12.306.sql index e64122d0..f149ac53 100644 --- a/laboratory/resources/schemas/dbscripts/sqlserver/laboratory-12.305-12.306.sql +++ b/laboratory/resources/schemas/dbscripts/sqlserver/laboratory-12.305-12.306.sql @@ -5,7 +5,7 @@ ALTER TABLE laboratory.species ADD createdby int; ALTER TABLE laboratory.species ADD modified datetime; ALTER TABLE laboratory.species ADD modifiedby int; GO -UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers WHERE name = 'Shared'); +UPDATE laboratory.species SET container = (SELECT entityid FROM core.containers c1 WHERE name = 'Shared' and (select parent from core.Containers c2 where c2.EntityId = c1.Parent) is null); ALTER TABLE laboratory.species DROP CONSTRAINT PK_species; ALTER TABLE laboratory.species ADD CONSTRAINT PK_species PRIMARY KEY (rowid); \ No newline at end of file