From 574278fea6ee4fe579548706940abdc2f6caa49d Mon Sep 17 00:00:00 2001
From: Jesus Flores <43448209+simpat-jesus@users.noreply.github.com>
Date: Mon, 23 Jan 2023 10:19:30 -0600
Subject: [PATCH 1/2] Added missing indexes to EdFi_Admin db (#642)

---
 .../0120-Add-GetClientForKey-Indexes.sql      | 25 +++++++++++++++++++
 .../0120-Add-GetClientForKey-Indexes.sql      | 22 ++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 Artifacts/MsSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql
 create mode 100644 Artifacts/PgSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql

diff --git a/Artifacts/MsSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql b/Artifacts/MsSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql
new file mode 100644
index 0000000000..4e2b5c21f4
--- /dev/null
+++ b/Artifacts/MsSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql
@@ -0,0 +1,25 @@
+-- SPDX-License-Identifier: Apache-2.0
+-- Licensed to the Ed-Fi Alliance under one or more agreements.
+-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+-- See the LICENSE and NOTICES files in the project root for more information.
+
+-- Index [AK_ApiClients] --
+BEGIN TRANSACTION
+    IF NOT EXISTS (SELECT * FROM sys.indexes WHERE object_id = OBJECT_ID(N'dbo.ApiClients') AND name = N'AK_ApiClients')
+    CREATE UNIQUE INDEX AK_ApiClients ON dbo.ApiClients ([Key])
+    GO
+COMMIT
+
+-- Index [IX_VendorNamespacePrefixes_VendorId] --
+BEGIN TRANSACTION
+    IF NOT EXISTS (SELECT * FROM sys.indexes WHERE object_id = OBJECT_ID(N'dbo.VendorNamespacePrefixes') AND name = N'IX_VendorNamespacePrefixes_VendorId')
+    CREATE INDEX IX_VendorNamespacePrefixes_VendorId ON dbo.VendorNamespacePrefixes	(Vendor_VendorId) INCLUDE (NamespacePrefix)
+    GO
+COMMIT
+
+-- Index [IX_ApiClientOwnershipTokens_ApiClientId] --
+BEGIN TRANSACTION
+    IF NOT EXISTS (SELECT * FROM sys.indexes WHERE object_id = OBJECT_ID(N'dbo.ApiClientOwnershipTokens') AND name = N'IX_ApiClientOwnershipTokens_ApiClientId')
+    CREATE INDEX IX_ApiClientOwnershipTokens_ApiClientId ON dbo.ApiClientOwnershipTokens (ApiClient_ApiClientId) INCLUDE (OwnershipToken_OwnershipTokenId)
+    GO
+COMMIT
\ No newline at end of file
diff --git a/Artifacts/PgSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql b/Artifacts/PgSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql
new file mode 100644
index 0000000000..d9ac15bf3b
--- /dev/null
+++ b/Artifacts/PgSql/Structure/Admin/0120-Add-GetClientForKey-Indexes.sql
@@ -0,0 +1,22 @@
+-- SPDX-License-Identifier: Apache-2.0
+-- Licensed to the Ed-Fi Alliance under one or more agreements.
+-- The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0.
+-- See the LICENSE and NOTICES files in the project root for more information.
+
+-- Index AK_ApiClients --
+CREATE UNIQUE INDEX IF NOT EXISTS AK_ApiClients ON dbo.ApiClients
+(
+    ApiClientId
+);
+
+-- Index IX_VendorNamespacePrefixes_VendorId --
+CREATE INDEX IF NOT EXISTS IX_VendorNamespacePrefixes_VendorId ON dbo.VendorNamespacePrefixes
+(
+    Vendor_VendorId
+) INCLUDE (NamespacePrefix);
+
+-- Index IX_ApiClientOwnershipTokens_ApiClientId --
+CREATE INDEX IF NOT EXISTS IX_ApiClientOwnershipTokens_ApiClientId ON dbo.ApiClientOwnershipTokens
+(
+    ApiClient_ApiClientId
+) INCLUDE (OwnershipToken_OwnershipTokenId);
\ No newline at end of file

From f3d5144c09199b72c2d212bcc0ab752b2cb02119 Mon Sep 17 00:00:00 2001
From: CSR2017 <suganya@imanisoftware.com>
Date: Fri, 23 Feb 2024 15:09:09 -0600
Subject: [PATCH 2/2] Update packages path

---
 .github/workflows/Pkg EdFi.Database.Admin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/Pkg EdFi.Database.Admin.yml b/.github/workflows/Pkg EdFi.Database.Admin.yml
index 872a7bdff6..24985e5e1c 100644
--- a/.github/workflows/Pkg EdFi.Database.Admin.yml	
+++ b/.github/workflows/Pkg EdFi.Database.Admin.yml	
@@ -84,7 +84,7 @@ jobs:
         [int]$BuildIncrementer = "${{ env.BUILD_INCREMENTER }}"
         [int]$newRevision =  $BuildCounter + $BuildIncrementer
         [string]$version = "${{env.INFORMATIONAL_VERSION}}"+ "." + $newRevision.ToString()
-        $packageOutput = "$env:GITHUB_WORKSPACE/Ed-Fi-ODS-Implementation/NugetPackages"
+        $packageOutput = "$env:GITHUB_WORKSPACE/Ed-Fi-ODS/NugetPackages"
         $AdminNuspecFilePath = "$env:GITHUB_WORKSPACE/NugetPackages/EdFi.Database.Admin.nuspec"
         $AdminBACPACNuspecFilePath = "$env:GITHUB_WORKSPACE/NugetPackages/EdFi.Database.Admin.BACPAC.nuspec"
         $AdminPostgreSQLNuspecFilePath = "$env:GITHUB_WORKSPACE/NugetPackages/EdFi.Database.Admin.PostgreSQL.nuspec"