Merge pull request #12 from mk3008/10-enhance-logging-functionality

10 enhance logging functionality
mk3008 · Dec 17, 2023 · db9d8b1 · db9d8b1
2 parents fc8950d + 9bead94
commit db9d8b1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/RedOrb/LoggingDbCommand.cs b/src/RedOrb/LoggingDbCommand.cs
@@ -50,6 +50,27 @@ private void WriteLog([CallerMemberName] string callerMethodName = "unknown")
 		Logger.Log(LogLevel, callerMethodName + ";\n" + GetParameterText() + CommandText + ";");
 	}
 
+	private void WriteExecuteResultLog(int rows, [CallerMemberName] string callerMethodName = "unknown")
+	{
+		Logger.Log(LogLevel, callerMethodName + " result : " + rows);
+	}
+
+	private void WriteExecuteScalarLog(object? value, [CallerMemberName] string callerMethodName = "unknown")
+	{
+		if (value == null)
+		{
+			Logger.Log(LogLevel, callerMethodName + " return : NULL");
+		}
+		else if (value.GetType() == typeof(string))
+		{
+			Logger.Log(LogLevel, callerMethodName + $" return : '{value}'");
+		}
+		else
+		{
+			Logger.Log(LogLevel, callerMethodName + $" return : {value}");
+		}
+	}
+
 	#region "implements interface"
 
 	public string CommandText { get => DbCommand.CommandText; set => DbCommand.CommandText = value; }
@@ -84,7 +105,9 @@ public void Dispose()
 	public int ExecuteNonQuery()
 	{
 		WriteLog();
-		return DbCommand.ExecuteNonQuery();
+		var val = DbCommand.ExecuteNonQuery();
+		WriteExecuteResultLog(val);
+		return val;
 	}
 
 	public IDataReader ExecuteReader()
@@ -102,7 +125,9 @@ public IDataReader ExecuteReader(CommandBehavior behavior)
 	public object? ExecuteScalar()
 	{
 		WriteLog();
-		return DbCommand.ExecuteScalar();
+		var val = DbCommand.ExecuteScalar();
+		WriteExecuteScalarLog(val);
+		return val;
 	}
 
 	public void Prepare()

diff --git a/src/RedOrb/RedOrb.csproj b/src/RedOrb/RedOrb.csproj
@@ -12,7 +12,7 @@
     <Copyright>Copyright (c) MSugiura 2023</Copyright>
     <PackageReleaseNotes></PackageReleaseNotes>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
     <Authors>MSugiura</Authors>
     <Description>simply object relation mapping framework.</Description>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>