发布2.1.1版本；

zqlovejyc · Apr 14, 2021 · 483056c · 483056c
1 parent 935306e
commit 483056c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/SQLBuilder/Diagnostics/DiagnosticsMessage.cs b/SQLBuilder/Diagnostics/DiagnosticsMessage.cs
@@ -16,6 +16,7 @@
  */
 #endregion
 
+using SQLBuilder.Enums;
 using System;
 
 namespace SQLBuilder.Diagnostics
@@ -35,6 +36,11 @@ public class DiagnosticsMessage
         /// </summary>
         public string Operation { get; set; }
 
+        /// <summary>
+        /// 操作id
+        /// </summary>
+        public string OperationId { get; set; } = Guid.NewGuid().ToString();
+
         /// <summary>
         /// sql语句
         /// </summary>
@@ -45,6 +51,11 @@ public class DiagnosticsMessage
         /// </summary>
         public object Parameters { get; set; }
 
+        /// <summary>
+        /// 数据库类型
+        /// </summary>
+        public DatabaseType DatabaseType { get; set; }
+
         /// <summary>
         /// 数据库数据源
         /// </summary>

diff --git a/SQLBuilder/Properties/AssemblyInfo.cs b/SQLBuilder/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/SQLBuilder/Repositories/BaseRepository.cs b/SQLBuilder/Repositories/BaseRepository.cs
@@ -3652,7 +3652,8 @@ public DiagnosticsMessage ExecuteBefore(string sql, object parameter, string dat
                     Parameters = parameter,
                     DataSource = dataSource,
                     Timestamp = (long)(DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds,
-                    Operation = DiagnosticStrings.BeforeExecute
+                    Operation = DiagnosticStrings.BeforeExecute,
+                    DatabaseType = DatabaseType
                 };
 
                 _diagnosticListener.Write(DiagnosticStrings.BeforeExecute, message);

diff --git a/SQLBuilder/SQLBuilder.csproj b/SQLBuilder/SQLBuilder.csproj
@@ -44,13 +44,13 @@
       <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
     </Reference>
     <Reference Include="MySqlConnector, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySqlConnector.1.3.0\lib\net45\MySqlConnector.dll</HintPath>
+      <HintPath>..\packages\MySqlConnector.1.3.3\lib\net45\MySqlConnector.dll</HintPath>
     </Reference>
     <Reference Include="Npgsql, Version=4.0.11.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
       <HintPath>..\packages\Npgsql.4.0.11\lib\net45\Npgsql.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.19.10.1\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
+      <HintPath>..\packages\Oracle.ManagedDataAccess.19.11.0\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

diff --git a/SQLBuilder/app.config b/SQLBuilder/app.config
@@ -2,7 +2,7 @@
 <configuration>
   <configSections>
     <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-    </configSections>
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>

diff --git a/SQLBuilder/packages.config b/SQLBuilder/packages.config
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Dapper" version="1.50.2" targetFramework="net45" />
-  <package id="MySqlConnector" version="1.3.0" targetFramework="net45" />
+  <package id="MySqlConnector" version="1.3.3" targetFramework="net45" />
   <package id="Npgsql" version="4.0.11" targetFramework="net45" />
-  <package id="Oracle.ManagedDataAccess" version="19.10.1" targetFramework="net45" />
+  <package id="Oracle.ManagedDataAccess" version="19.11.0" targetFramework="net45" />
   <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.113.3" targetFramework="net45" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net45" />
   <package id="System.Data.SQLite.Core" version="1.0.113.7" targetFramework="net45" />