Upgraded PcAxis.Sql nuget to 1.2.5

PxWeb/Code/Api2/DataSource/Cnmm/CnmmDataSource.cs

@@ -71,7 +71,7 @@
 
         }
 
         private Item? CreateMenu(string language, ItemSelection itmSel)
         {
             var cnmmOptions = _cnmmConfigurationService.GetConfiguration();
 
@@ -86,12 +86,12 @@
                         m.RootSelection = itmSel;
                         m.AlterItemBeforeStorage = item =>
                         {
                             if (item is Url)
                             {
                                 Url url = (Url)item;
                             }
 
                             if (item is TableLink)
                             {
                                 TableLink tbl = (TableLink)item;
 
@@ -116,7 +116,7 @@
                                 item.SortCode = item.Text;
                             }
                         };
                         m.Restriction = item => { return true; }; // TODO: Will show all tables! Even though they are not published...
                     });
             retMenu.RootItem.Sort();
 
@@ -153,7 +153,7 @@
             return selectionExists;
         }
 
         private string CreateTableTitleWithInterval(TableLink child)
         {
             StringBuilder sb = new StringBuilder();
 
@@ -172,7 +172,7 @@
             {
                 return sb.ToString();
             }
             if (child.Text.EndsWith("-"))//Title ends with a dash, only endtime should be added
             {
                 sb.Append(child.EndTime);
                 return sb.ToString();
@@ -213,16 +213,15 @@
         private Codelist? GetGrouping(string id, string language)
         {
             Codelist? codelist = null;
-            var cnmmOptions = _cnmmConfigurationService.GetConfiguration();
 
             if (id.StartsWith("agg_", System.StringComparison.InvariantCultureIgnoreCase))
             {
                 // Remove leading "agg_" from id
                 id = id.Substring(4);
             }
 
-            PCAxis.Sql.Repositories.GroupingRepository repo = new PCAxis.Sql.Repositories.GroupingRepository(cnmmOptions.DatabaseID);
-            PCAxis.Sql.Models.Grouping grouping = repo.GetGrouping(id, language);
+            var util = new PCAxis.Sql.ApiUtils.ApiUtil();
+            PCAxis.Sql.Models.Grouping grouping = util.GetGrouping(id, language);
 
             if (grouping != null)
             {
@@ -235,16 +234,15 @@
         private Codelist? GetValueset(string id, string language)
         {
             Codelist? codelist = null;
-            var cnmmOptions = _cnmmConfigurationService.GetConfiguration();
 
             if (id.StartsWith("vs_", System.StringComparison.InvariantCultureIgnoreCase))
             {
                 // Remove leading "vs_" from id
                 id = id.Substring(3);
             }
 
-            PCAxis.Sql.Repositories.ValueSetRepository repo = new PCAxis.Sql.Repositories.ValueSetRepository(cnmmOptions.DatabaseID);
-            PCAxis.Sql.Models.ValueSet valueset = repo.GetValueSet(id, language);
+            var util = new PCAxis.Sql.ApiUtils.ApiUtil();
+            PCAxis.Sql.Models.ValueSet valueset = util.GetValueSet(id, language);
 
             if (valueset != null)
             {

PxWeb/PxWeb.csproj

@@ -50,7 +50,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="PCAxis.Menu.ConfigDatamodelMenu" Version="1.0.8" />
     <PackageReference Include="PCAxis.Serializers" Version="1.3.1" />
-    <PackageReference Include="PcAxis.Sql" Version="1.2.4" />
+    <PackageReference Include="PcAxis.Sql" Version="1.2.5" />
     <PackageReference Include="PxWeb.Api2.Server" Version="2.0.0-beta.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="7.2.0" />