Remove System.Data.OleDb package reference

albertospelta · albertospelta · commit 7c2856463da2 · 2024-07-05T15:02:23.000+02:00
diff --git a/src/Dax.Model.Extractor/Data/IDbConnectionExtensions.cs b/src/Dax.Model.Extractor/Data/IDbConnectionExtensions.cs
diff --git a/src/Dax.Model.Extractor/Dax.Model.Extractor.csproj b/src/Dax.Model.Extractor/Dax.Model.Extractor.csproj
@@ -22,7 +22,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
-    <PackageReference Include="System.Data.OleDb" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="Microsoft.AnalysisServices.retail.amd64" />
diff --git a/src/Dax.Model.Extractor/DmvExtractor.cs b/src/Dax.Model.Extractor/DmvExtractor.cs
@@ -34,7 +34,9 @@ public class DmvExtractor
 
         protected IDbCommand CreateCommand(string commandText)
         {
-            return Connection.CreateCommand(commandText);
+            var command = Connection.CreateCommand();
+            command.CommandText = commandText;
+            return command;
         }
 
         public DmvExtractor(Dax.Metadata.Model daxModel, IDbConnection connection, string serverName, string databaseName, string extractorApp, string extractorVersion)
diff --git a/src/Dax.Model.Extractor/StatExtractor.cs b/src/Dax.Model.Extractor/StatExtractor.cs
@@ -19,7 +19,9 @@ private StatExtractor(Dax.Metadata.Model daxModel, IDbConnection connection)
 
         protected IDbCommand CreateCommand(string commandText)
         {
-            return Connection.CreateCommand(commandText);
+            var command = Connection.CreateCommand();
+            command.CommandText = commandText;
+            return command;
         }
 
         // UpdateStatisticsModel has been marked as obsolete because its usage may require rerunning the DMVs for models with DirectLake partitions. Since this logic should be handled by the library, we may consider removing it from the public APIs in a future release.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -12,7 +12,6 @@
     <PackageVersion Include="Microsoft.AnalysisServices.AdomdClient.NetCore.retail.amd64" Version="$(MicrosoftAnalysisServicesVersion)" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="System.Data.OleDb" Version="6.0.0" />
     <PackageVersion Include="System.IO.Packaging" Version="6.0.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ public class DmvExtractor`
`34`	`34`
`35`	`35`	`protected IDbCommand CreateCommand(string commandText)`
`36`	`36`	`{`
`37`		`- return Connection.CreateCommand(commandText);`
	`37`	`+ var command = Connection.CreateCommand();`
	`38`	`+ command.CommandText = commandText;`
	`39`	`+ return command;`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`public DmvExtractor(Dax.Metadata.Model daxModel, IDbConnection connection, string serverName, string databaseName, string extractorApp, string extractorVersion)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ private StatExtractor(Dax.Metadata.Model daxModel, IDbConnection connection)`
`19`	`19`
`20`	`20`	`protected IDbCommand CreateCommand(string commandText)`
`21`	`21`	`{`
`22`		`- return Connection.CreateCommand(commandText);`
	`22`	`+ var command = Connection.CreateCommand();`
	`23`	`+ command.CommandText = commandText;`
	`24`	`+ return command;`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`// UpdateStatisticsModel has been marked as obsolete because its usage may require rerunning the DMVs for models with DirectLake partitions. Since this logic should be handled by the library, we may consider removing it from the public APIs in a future release.`