From 1b451787ee6997cae36d110ae2a0dd74125b5620 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Mon, 19 May 2025 18:38:13 +0000 Subject: [PATCH 1/4] [autocommit] bumping build number --- src/main/resources/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties index 5dda72802..8ec9f3000 100644 --- a/src/main/resources/version.properties +++ b/src/main/resources/version.properties @@ -15,5 +15,5 @@ # -version=v1.1.0+959 -versionInfo=https://github.com/Breeding-Insight/bi-api/commit/738dee1bea47d07b5e24a37304dd83e6d3f29b65 +version=v1.1.0+965 +versionInfo=https://github.com/Breeding-Insight/bi-api/commit/c66193ae96e86b4edafa4b117b101e1b2e1a7ed8 From bcd7f16800bb6fcdf51a893f41222313478a3c7c Mon Sep 17 00:00:00 2001 From: Nick <53413353+nickpalladino@users.noreply.github.com> Date: Mon, 19 May 2025 15:32:46 -0400 Subject: [PATCH 2/4] Update version number --- src/main/resources/version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties index 8ec9f3000..f9fc4d945 100644 --- a/src/main/resources/version.properties +++ b/src/main/resources/version.properties @@ -15,5 +15,5 @@ # -version=v1.1.0+965 +version=v1.1.1+965 versionInfo=https://github.com/Breeding-Insight/bi-api/commit/c66193ae96e86b4edafa4b117b101e1b2e1a7ed8 From 0a9f8baaceb8572fec2329c97d01f63a2e7e7a76 Mon Sep 17 00:00:00 2001 From: rob-ouser-bi Date: Mon, 19 May 2025 19:33:04 +0000 Subject: [PATCH 3/4] [autocommit] bumping build number --- src/main/resources/version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/version.properties b/src/main/resources/version.properties index f9fc4d945..9eebddfde 100644 --- a/src/main/resources/version.properties +++ b/src/main/resources/version.properties @@ -15,5 +15,5 @@ # -version=v1.1.1+965 -versionInfo=https://github.com/Breeding-Insight/bi-api/commit/c66193ae96e86b4edafa4b117b101e1b2e1a7ed8 +version=v1.1.1+969 +versionInfo=https://github.com/Breeding-Insight/bi-api/commit/bcd7f16800bb6fcdf51a893f41222313478a3c7c From da9891911b9b75a1b2f13340036180ae342ad976 Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Thu, 29 May 2025 12:10:18 -0400 Subject: [PATCH 4/4] [BI-2654] - replaced reserved keyword with allowed value --- src/test/resources/sql/UserControllerIntegrationTest.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/resources/sql/UserControllerIntegrationTest.sql b/src/test/resources/sql/UserControllerIntegrationTest.sql index 55cafed8d..5dce6cca0 100644 --- a/src/test/resources/sql/UserControllerIntegrationTest.sql +++ b/src/test/resources/sql/UserControllerIntegrationTest.sql @@ -27,19 +27,19 @@ join bi_user on bi_user.name = 'system' limit 1; -- name: InsertUserProgramAssociations insert into program_user_role (program_id, user_id, role_id, created_by, updated_by) -select program.id, bi_user.id, role.id, system_user.id, system_user.id +select program.id, bi_user.id, role.id, bi_system_user.id, bi_system_user.id from program join bi_user on bi_user.name = 'Test User' or bi_user.name = 'Other Test User' join role on role.domain = 'Read Only' -join bi_user as system_user on system_user.name = 'system' +join bi_user as bi_system_user on bi_system_user.name = 'system' where program.name = 'Test Program'; insert into program_user_role (program_id, user_id, role_id, active, created_by, updated_by) -select program.id, bi_user.id, role.id, false, system_user.id, system_user.id +select program.id, bi_user.id, role.id, false, bi_system_user.id, bi_system_user.id from program join bi_user on bi_user.name = 'Test User' or bi_user.name = 'Other Test User' join role on role.domain = 'Read Only' -join bi_user as system_user on system_user.name = 'system' +join bi_user as bi_system_user on bi_system_user.name = 'system' where program.name = 'Test Program1'; -- name: DeactivateProgram