Merge pull request #29 from valadas/issue-28

Fixed deprecated sql syntax
DNNCommunity · Apr 27, 2019 · ddcd775 · ddcd775
2 parents d444898 + 62dc2ad
commit ddcd775
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/03.01.00.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/03.01.00.SqlDataProvider
@@ -146,9 +146,9 @@ select SurveyID,
        Question,
        ViewOrder,
        OptionType,
-       'CreatedByUser' = {objectQualifier}Users.FirstName + ' ' + {objectQualifier}Users.LastName,
+       {objectQualifier}Users.FirstName + ' ' + {objectQualifier}Users.LastName AS CreatedByUser,
        CreatedDate,
-       'Votes' = ( select sum(Votes) from {objectQualifier}SurveyOptions where {objectQualifier}SurveyOptions.SurveyID = {objectQualifier}Surveys.SurveyID )
+       ( select sum(Votes) from {objectQualifier}SurveyOptions where {objectQualifier}SurveyOptions.SurveyID = {objectQualifier}Surveys.SurveyID ) AS Votes
 from   {objectQualifier}Surveys
 left outer join {objectQualifier}Users on {objectQualifier}Surveys.CreatedByUser = {objectQualifier}Users.UserID
 where  SurveyID = @SurveyID

diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/03.03.00.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/03.03.00.SqlDataProvider
@@ -100,7 +100,7 @@ SELECT
        S.OptionType,
        S.CreatedByUser,
        S.CreatedDate,
-       'Votes' = ( SELECT sum(Votes) FROM {databaseOwner}{objectQualifier}SurveyOptions SO WHERE SO.SurveyID = S.SurveyID )
+       ( SELECT sum(Votes) FROM {databaseOwner}{objectQualifier}SurveyOptions SO WHERE SO.SurveyID = S.SurveyID ) AS Votes
 FROM   {databaseOwner}{objectQualifier}Surveys S
 WHERE  SurveyID = @SurveyID
 AND    ModuleID = @ModuleID

diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/04.50.00.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/04.50.00.SqlDataProvider
@@ -188,7 +188,7 @@ select
        S.OptionType,
        S.CreatedByUser,
        S.CreatedDate,
-       'Votes' = ( select sum(Votes) from {databaseOwner}{objectQualifier}SurveyOptions SO where SO.SurveyID = S.SurveyID )
+       ( select sum(Votes) from {databaseOwner}{objectQualifier}SurveyOptions SO where SO.SurveyID = S.SurveyID ) AS Votes
 from   {databaseOwner}{objectQualifier}Surveys S
 where  SurveyID = @SurveyID
 and    ModuleID = @ModuleID

diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/04.60.00.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/04.60.00.SqlDataProvider
@@ -42,6 +42,8 @@ WHERE
 (S.ModuleID = @ModuleID) 
 )
 
+GO
+
 /************************************************************/
 /*****              SqlDataProvider                     *****/
 /************************************************************/
diff --git a/DNN.Survey/Providers/DataProviders/SqlDataProvider/09.00.00.SqlDataProvider b/DNN.Survey/Providers/DataProviders/SqlDataProvider/09.00.00.SqlDataProvider
@@ -72,7 +72,7 @@ BEGIN
       */
       0 AS ChartType,
       CreatedDate,
-      CreatedByUser
+      CreatedByUserID
    FROM
       {databaseOwner}{objectQualifier}Surveys
    WHERE