From 05cea3866ce4df9c65ec888a31da65a09324fff8 Mon Sep 17 00:00:00 2001 From: Ken Taylor Date: Thu, 16 Feb 2017 11:50:24 -0800 Subject: [PATCH 1/2] I needed to add a grouping statement after I added IsAdmin as one of the return columns. I also updated the Usage statement as it was calling the previous script that returned all the columns. --- .../dbo/Functions/udf_GetCommentHistoryForLogin.sql | 12 ++++++++---- .../udf_GetReadAndEditAccessOrderIdsForLogin.sql | 4 +++- PurchasingTP.AzureDb/dbo/Views/Get_NEWID.sql | 4 ++++ 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 PurchasingTP.AzureDb/dbo/Views/Get_NEWID.sql diff --git a/PurchasingTP.AzureDb/dbo/Functions/udf_GetCommentHistoryForLogin.sql b/PurchasingTP.AzureDb/dbo/Functions/udf_GetCommentHistoryForLogin.sql index 98d9a7921..0b61f97df 100644 --- a/PurchasingTP.AzureDb/dbo/Functions/udf_GetCommentHistoryForLogin.sql +++ b/PurchasingTP.AzureDb/dbo/Functions/udf_GetCommentHistoryForLogin.sql @@ -1,5 +1,6 @@  + -- ============================================= -- Author: Ken Taylor -- Create date: January 20, 2017 @@ -8,9 +9,11 @@ -- Replaces vCommenthistory.-- -- Usage: /* - select * from udf_GetCommentHistoryForLogin('bazemore', 5) + select * from udf_GetCommentHistoryForLogin('rajahn', 5) */ -- Modifications: +-- 20170216 by kjt: Needed to add grouping statement in order not to repeat same comment being returned than once because we added column "isAdmin" to +-- udf_GetReadAndEditAccessOrderIdsForLogin after this was initially created. -- ============================================= CREATE FUNCTION [dbo].[udf_GetCommentHistoryForLogin] ( @@ -41,11 +44,12 @@ BEGIN dbo.OrderComments.UserId AS createdbyuserid, dbo.OrderComments.DateCreated, @LoginId AS access - FROM dbo.udf_GetReadAndEditAccessOrderIdsForLogin(@LoginId) access -- Returns orderIds only + FROM dbo.udf_GetReadAndEditAccessOrderIdsForLogin(@LoginId) access -- Returns orderIds AND isAdmin only INNER JOIN dbo.OrderComments ON access.OrderId = dbo.OrderComments.OrderId INNER JOIN dbo.Orders ON dbo.Orders.Id = dbo.OrderComments.OrderId - INNER JOIN dbo.Users ON dbo.Users.Id = dbo.OrderComments.UserId -ORDER BY dbo.OrderComments.DateCreated DESC + INNER JOIN dbo.Users ON dbo.Users.Id = dbo.OrderComments.UserId +GROUP BY access.OrderId, OrderComments.OrderId, Orders.RequestNumber, Users.FirstName, Users.LastName, OrderComments.Text, UserId, OrderComments.DateCreated +ORDER BY dbo.OrderComments.DateCreated DESC, access.OrderId, OrderComments.OrderId, Orders.RequestNumber, Users.FirstName, Users.LastName, OrderComments.Text, UserId RETURN END \ No newline at end of file diff --git a/PurchasingTP.AzureDb/dbo/Functions/udf_GetReadAndEditAccessOrderIdsForLogin.sql b/PurchasingTP.AzureDb/dbo/Functions/udf_GetReadAndEditAccessOrderIdsForLogin.sql index b25aa2899..53d0e6b3d 100644 --- a/PurchasingTP.AzureDb/dbo/Functions/udf_GetReadAndEditAccessOrderIdsForLogin.sql +++ b/PurchasingTP.AzureDb/dbo/Functions/udf_GetReadAndEditAccessOrderIdsForLogin.sql @@ -1,5 +1,6 @@  + -- ============================================= -- Author: Ken Taylor -- Create date: January 20, 2017 @@ -10,10 +11,11 @@ -- udf_GetReadAccessOrdersForLogin(@LoginId) user defined functions. -- Usage: /* - select * from udf_GetReadAndEditAccessOrdersForLogin('bazemore') + select * from udf_GetReadAndEditAccessOrderIdsForLogin('bazemore') */ -- Modifications: -- 20170124 by kjt: Added "isadmin" as additional return table column. +-- 20170216 by kjt: Revised USAGE to execute correct stored procedure. -- ============================================= CREATE FUNCTION [dbo].[udf_GetReadAndEditAccessOrderIdsForLogin] ( diff --git a/PurchasingTP.AzureDb/dbo/Views/Get_NEWID.sql b/PurchasingTP.AzureDb/dbo/Views/Get_NEWID.sql new file mode 100644 index 000000000..1751963f1 --- /dev/null +++ b/PurchasingTP.AzureDb/dbo/Views/Get_NEWID.sql @@ -0,0 +1,4 @@ + + +CREATE VIEW dbo.Get_NEWID AS +SELECT NEWID() AS MyNewID \ No newline at end of file From 44c5061a695626264b2d43ddf1fa10af6c518f03 Mon Sep 17 00:00:00 2001 From: Ken Taylor Date: Wed, 1 Mar 2017 11:27:22 -0800 Subject: [PATCH 2/2] Added additional view to Azure DB project --- PurchasingTP.AzureDb/PurchasingTP.AzureDb.sqlproj | 1 + 1 file changed, 1 insertion(+) diff --git a/PurchasingTP.AzureDb/PurchasingTP.AzureDb.sqlproj b/PurchasingTP.AzureDb/PurchasingTP.AzureDb.sqlproj index a4d4e5989..922a51ee4 100644 --- a/PurchasingTP.AzureDb/PurchasingTP.AzureDb.sqlproj +++ b/PurchasingTP.AzureDb/PurchasingTP.AzureDb.sqlproj @@ -190,6 +190,7 @@ +