Merge pull request #1595 from iTerminate/master

Release CDB Path

Author: iTerminate

db/sql/updates/updateTo3.15.1.sql db/sql/updates/old/updateTo3.15.1.sqldb/sql/updates/updateTo3.15.1.sql renamed to db/sql/updates/old/updateTo3.15.1.sql

@@ -0,0 +1,49 @@
+--
+-- Copyright (c) UChicago Argonne, LLC. All rights reserved.
+-- See LICENSE file.
+--
+
+-- Execute by running `mysql CDB_DB_NAME --host=127.0.0.1 --user=cdb -p < updateTo3.15.4.sql`
+
+
+delimiter //
+
+DROP PROCEDURE IF EXISTS is_item_relationship_have_circular_reference;//
+CREATE PROCEDURE `is_item_relationship_have_circular_reference` (IN relationship_type_id int, IN parent_item_id int, IN proposed_child_item_id int)
+BEGIN	
+	-- Get all parents for the existing parent item.
+	SELECT * FROM item WHERE ID IN (
+		WITH RECURSIVE parent_relationship_hierarchy AS (
+			SELECT * 
+			FROM v_relationship_hierarchy vrh
+			WHERE vrh.child_item_id = parent_item_id
+			AND vrh.relationship_type_id = relationship_type_id
+			UNION
+			SELECT vrh2.*
+			FROM v_relationship_hierarchy vrh2, parent_relationship_hierarchy a
+			WHERE vrh2.child_item_id = a.parent_item_id
+			AND vrh2.relationship_type_id = relationship_type_id
+		)		
+		SELECT prh.parent_item_id
+		FROM parent_relationship_hierarchy prh
+	) and ID IN (
+	-- Compare if any children match the parent in proposed children items.	
+	SELECT id FROM item WHERE 
+	-- Ensure single level circular reference doesn't occur.
+	ID = proposed_child_item_id 
+	OR ID IN (
+		WITH RECURSIVE child_relationship_hierarchy AS (
+			SELECT * 
+			FROM v_relationship_hierarchy vrh
+			WHERE vrh.parent_item_id = proposed_child_item_id
+			AND vrh.relationship_type_id = relationship_type_id
+			UNION
+			SELECT vrh2.*
+			FROM v_relationship_hierarchy vrh2, child_relationship_hierarchy a
+			WHERE vrh2.parent_item_id = a.child_item_id
+			AND vrh2.relationship_type_id = relationship_type_id
+		)		
+		SELECT crh.child_item_id
+		FROM child_relationship_hierarchy crh)
+	);
+END //

db/sql/updates/updateTo3.15.3.sql db/sql/updates/old/updateTo3.15.3.sqldb/sql/updates/updateTo3.15.3.sql renamed to db/sql/updates/old/updateTo3.15.3.sql

@@ -1 +1 @@
-3.15.3
+3.15.4

db/sql/updates/updateTo3.15.4.sql

@@ -4,7 +4,7 @@ prettyPrint: true
 cacheTTL: 0
 openAPI:
   info:
-    version: '3.15.3'
+    version: '3.15.4'
     title: Component Database API
     description: 'The API that provides access to Component Database data.'
     contact:

etc/version

@@ -1,5 +1,5 @@
 {% set name = "ComponentDB-API" %}
-{% set version = "3.15.3" %}
+{% set version = "3.15.4" %}
 
 package:
   name: "{{ name|lower }}"  

src/java/CdbWebPortal/src/java/openapi.yaml

@@ -1,5 +1,5 @@
 {% set name = "ComponentDB-CLI" %}
-{% set version = "3.15.3" %}
+{% set version = "3.15.4" %}
 
 package:
   name: "{{ name|lower }}"

tools/developer_tools/python-client/conda-recipe/API/meta.yaml

@@ -16,7 +16,7 @@
 from setuptools import find_packages
 
 setup(name='ComponentDB-API',
-      version='3.15.3',
+      version='3.15.4',
       packages=["cdbApi",
                 "cdbApi.api",
                 "cdbApi.models"],

tools/developer_tools/python-client/conda-recipe/CLI/meta.yaml

@@ -16,7 +16,7 @@
 from setuptools import find_packages
 
 setup(name='ComponentDB-CLI',
-      version='3.15.3',
+      version='3.15.4',
       packages=['cdbCli',
                 'cdbCli.common',
                 'cdbCli.common.cli',
@@ -32,7 +32,7 @@
                         'pandas',
                         'rich',
                         'InquirerPy',
-                        'ComponentDB-API==3.15.2'],
+                        'ComponentDB-API==3.15.4'],
       license='Copyright (c) UChicago Argonne, LLC. All rights reserved.',
       description='Python APIs used to communicate with java hosted ComponentDB API.',
       maintainer='Dariusz Jarosz',