Performance improved

sheryever · May 8, 2020 · c219549 · c219549
1 parent 3e49463
commit c219549
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/Source/SimpleAccess.SqlServer/SimpleAccess.SqlServer.csproj b/Source/SimpleAccess.SqlServer/SimpleAccess.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
     <TargetFrameworks>net40;net45;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <Version>3.1.0-rc-4</Version>
+    <Version>3.1.0-rc-5</Version>
     <Product>SimpleAccess Sql Server ORM</Product>
     <Description>Simple Access ORM provides database access in Ado.net methods naming pattern.
 Documentation of using SimpleAccess is available at https://simpleaccessorm.com
@@ -34,8 +34,8 @@ Documentation of using SimpleAccess is available at https://simpleaccessorm.com
       Bug fixes
       - SqlEntityRepository Get, Find, FindAll methods fixed
       - Insert is not working with Indentity column</PackageReleaseNotes>
-    <AssemblyVersion>3.1.0.9</AssemblyVersion>
-    <FileVersion>3.1.0.9</FileVersion>
+    <AssemblyVersion>3.1.0.10</AssemblyVersion>
+    <FileVersion>3.1.0.10</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">

diff --git a/Source/SimpleAccess.SqlServer/SqlSimpleAccess.cs b/Source/SimpleAccess.SqlServer/SqlSimpleAccess.cs
@@ -1001,7 +1001,7 @@ public TEntity ExecuteEntity<TEntity>(string commandText, CommandType commandTyp
             {
                 dbCommand = CreateCommand(commandText, commandType, sqlParameters);
                 dbCommand.Connection.OpenSafely();
-                using (var reader = dbCommand.ExecuteReader(CommandBehavior.SingleRow))
+                using (var reader = dbCommand.ExecuteReader(CommandBehavior.SingleResult | CommandBehavior.SingleRow ))
                 {
                     return reader.HasRows ? reader.DataReaderToObject<TEntity>(fieldsToSkip, propertyInfoDictionary) : null;
                 }
@@ -1104,7 +1104,7 @@ public TEntity ExecuteEntity<TEntity>(SqlTransaction sqlTransaction, string comm
             {
                 dbCommand = CreateCommand(sqlTransaction, commandText, commandType, sqlParameters);
                 dbCommand.Connection.OpenSafely();
-                using (var reader = dbCommand.ExecuteReader())
+                using (var reader = dbCommand.ExecuteReader(CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                 {
                     return reader.HasRows ? reader.DataReaderToObject<TEntity>(fieldsToSkip, propertyInfoDictionary) : null;
                 }
@@ -1371,7 +1371,7 @@ public dynamic ExecuteDynamic(string commandText, CommandType commandType, strin
             {
                 dbCommand = CreateCommand(commandText, commandType, sqlParameters);
                 dbCommand.Connection.OpenSafely();
-                var reader = dbCommand.ExecuteReader(CommandBehavior.SingleRow);
+                var reader = dbCommand.ExecuteReader(CommandBehavior.SingleResult | CommandBehavior.SingleRow);
                 if (reader.Read())
                 {
                     var result = SqlDataReaderToExpando(reader);
@@ -1463,7 +1463,7 @@ public dynamic ExecuteDynamic(SqlTransaction sqlTransaction, string commandText,
             {
                 dbCommand = CreateCommand(sqlTransaction, commandText, commandType, sqlParameters);
                 dbCommand.Connection.OpenSafely();
-                using (var reader = dbCommand.ExecuteReader())
+                using (var reader = dbCommand.ExecuteReader(CommandBehavior.SingleResult | CommandBehavior.SingleRow))
                 {
                     if (reader.Read())
                         return SqlDataReaderToExpando(reader);
@@ -1643,14 +1643,14 @@ public SqlTransaction BeginTransaction(IsolationLevel isolationLevel, string tra
         /// <returns> The new command. </returns>
         public SqlCommand CreateCommand(string commandText, CommandType commandType, params SqlParameter[] sqlParameters)
         {
-            var dbCommand = _sqlConnection.CreateCommand();
+            var dbCommand = new SqlCommand(commandText, _sqlConnection);
+                //_sqlConnection.CreateCommand();
             dbCommand.CommandTimeout = DefaultSimpleAccessSettings.DbCommandTimeout;
             dbCommand.CommandType = commandType;
-            dbCommand.CommandText = commandText;
+            //dbCommand.CommandText = commandText;
             if (sqlParameters != null)
                 dbCommand.Parameters.AddRange(sqlParameters);
 
-
             return dbCommand;
         }
 
@@ -1713,7 +1713,8 @@ public dynamic SqlDataReaderToExpando(SqlDataReader reader)
             for (var i = 0; i < reader.FieldCount; i++)
             {
                 var value = reader[i];
-                expandoObject.Add(reader.GetName(i), value == DBNull.Value ? null : value);
+                if (value != null)
+                    expandoObject.Add(reader.GetName(i), value);
             }
 
             return expandoObject;