Skip to content

Commit

Permalink
DNET-465
Browse files Browse the repository at this point in the history
  • Loading branch information
@cincuranet
cincuranet committed Nov 26, 2012
1 parent d46b4b5 commit 96f92bc
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 37 deletions.
60 changes: 30 additions & 30 deletions NETProvider/source/FirebirdSql/Data/Services/FbDatabaseTraceConfiguration.cs
View file
Expand Up @@ -59,71 +59,71 @@ public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.Append("<database");
sb.Append((!string.IsNullOrEmpty(this.DatabaseName) ? " " + this.DatabaseName : string.Empty));
sb.Append((!string.IsNullOrEmpty(this.DatabaseName) ? " " + WriteString(this.DatabaseName) : string.Empty));
sb.AppendLine(">");
sb.AppendFormat("enabled {0}", BoolValue(this.Enabled));
sb.AppendFormat("enabled {0}", WriteBoolValue(this.Enabled));
sb.AppendLine();
if (!string.IsNullOrEmpty(this.IncludeFilter))
{
sb.AppendFormat("include_filter {0}", this.IncludeFilter);
sb.AppendFormat("include_filter {0}", WriteRegEx(this.IncludeFilter));
sb.AppendLine();
}
if (!string.IsNullOrEmpty(this.ExcludeFilter))
{
sb.AppendFormat("exclude_filter {0}", this.ExcludeFilter);
sb.AppendFormat("exclude_filter {0}", WriteRegEx(this.ExcludeFilter));
sb.AppendLine();
}
sb.AppendFormat("log_connections {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Connections)));
sb.AppendFormat("log_connections {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Connections)));
sb.AppendLine();
sb.AppendFormat("connection_id {0}", this.ConnectionID);
sb.AppendFormat("connection_id {0}", WriteNumber(this.ConnectionID));
sb.AppendLine();
sb.AppendFormat("log_transactions {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Transactions)));
sb.AppendFormat("log_transactions {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Transactions)));
sb.AppendLine();
sb.AppendFormat("log_statement_prepare {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementPrepare)));
sb.AppendFormat("log_statement_prepare {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementPrepare)));
sb.AppendLine();
sb.AppendFormat("log_statement_free {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementFree)));
sb.AppendFormat("log_statement_free {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementFree)));
sb.AppendLine();
sb.AppendFormat("log_statement_start {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementStart)));
sb.AppendFormat("log_statement_start {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementStart)));
sb.AppendLine();
sb.AppendFormat("log_statement_finish {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementFinish)));
sb.AppendFormat("log_statement_finish {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.StatementFinish)));
sb.AppendLine();
sb.AppendFormat("log_procedure_start {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.ProcedureStart)));
sb.AppendFormat("log_procedure_start {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.ProcedureStart)));
sb.AppendLine();
sb.AppendFormat("log_procedure_finish {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.ProcedureFinish)));
sb.AppendFormat("log_procedure_finish {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.ProcedureFinish)));
sb.AppendLine();
sb.AppendFormat("log_trigger_start {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.TriggerStart)));
sb.AppendFormat("log_trigger_start {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.TriggerStart)));
sb.AppendLine();
sb.AppendFormat("log_trigger_finish {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.TriggerFinish)));
sb.AppendFormat("log_trigger_finish {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.TriggerFinish)));
sb.AppendLine();
sb.AppendFormat("log_context {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Context)));
sb.AppendFormat("log_context {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Context)));
sb.AppendLine();
sb.AppendFormat("log_errors {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Errors)));
sb.AppendFormat("log_errors {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Errors)));
sb.AppendLine();
sb.AppendFormat("log_sweep {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Sweep)));
sb.AppendFormat("log_sweep {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.Sweep)));
sb.AppendLine();
sb.AppendFormat("print_plan {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintPlan)));
sb.AppendFormat("print_plan {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintPlan)));
sb.AppendLine();
sb.AppendFormat("print_perf {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintPerf)));
sb.AppendFormat("print_perf {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintPerf)));
sb.AppendLine();
sb.AppendFormat("log_blr_requests {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.BLRRequests)));
sb.AppendFormat("log_blr_requests {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.BLRRequests)));
sb.AppendLine();
sb.AppendFormat("print_blr {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintBLR)));
sb.AppendFormat("print_blr {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintBLR)));
sb.AppendLine();
sb.AppendFormat("log_dyn_requests {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.DYNRequests)));
sb.AppendFormat("log_dyn_requests {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.DYNRequests)));
sb.AppendLine();
sb.AppendFormat("print_dyn {0}", BoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintDYN)));
sb.AppendFormat("print_dyn {0}", WriteBoolValue(this.Events.HasFlag(FbDatabaseTraceEvents.PrintDYN)));
sb.AppendLine();
sb.AppendFormat("time_threshold {0}", this.TimeThreshold);
sb.AppendFormat("time_threshold {0}", WriteNumber(this.TimeThreshold));
sb.AppendLine();
sb.AppendFormat("max_sql_length {0}", this.MaxSQLLength);
sb.AppendFormat("max_sql_length {0}", WriteNumber(this.MaxSQLLength));
sb.AppendLine();
sb.AppendFormat("max_blr_length {0}", this.MaxBLRLength);
sb.AppendFormat("max_blr_length {0}", WriteNumber(this.MaxBLRLength));
sb.AppendLine();
sb.AppendFormat("max_dyn_length {0}", this.MaxDYNLength);
sb.AppendFormat("max_dyn_length {0}", WriteNumber(this.MaxDYNLength));
sb.AppendLine();
sb.AppendFormat("max_arg_length {0}", this.MaxArgumentLength);
sb.AppendFormat("max_arg_length {0}", WriteNumber(this.MaxArgumentLength));
sb.AppendLine();
sb.AppendFormat("max_arg_count {0}", this.MaxArgumentsCount);
sb.AppendFormat("max_arg_count {0}", WriteNumber(this.MaxArgumentsCount));
sb.AppendLine();
sb.AppendLine("</database>");
return sb.ToString();
Expand Down
12 changes: 6 additions & 6 deletions NETProvider/source/FirebirdSql/Data/Services/FbServiceTraceConfiguration.cs
View file
Expand Up @@ -41,23 +41,23 @@ public override string ToString()
{
StringBuilder sb = new StringBuilder();
sb.AppendLine("<services>");
sb.AppendFormat("enabled {0}", BoolValue(this.Enabled));
sb.AppendFormat("enabled {0}", WriteBoolValue(this.Enabled));
sb.AppendLine();
if (!string.IsNullOrEmpty(this.IncludeFilter))
{
sb.AppendFormat("include_filter {0}", this.IncludeFilter);
sb.AppendFormat("include_filter {0}", WriteRegEx(this.IncludeFilter));
sb.AppendLine();
}
if (!string.IsNullOrEmpty(this.ExcludeFilter))
{
sb.AppendFormat("exclude_filter {0}", this.ExcludeFilter);
sb.AppendFormat("exclude_filter {0}", WriteRegEx(this.ExcludeFilter));
sb.AppendLine();
}
sb.AppendFormat("log_services {0}", BoolValue(this.Events.HasFlag(FbServiceTraceEvents.Services)));
sb.AppendFormat("log_services {0}", WriteBoolValue(this.Events.HasFlag(FbServiceTraceEvents.Services)));
sb.AppendLine();
sb.AppendFormat("log_service_query {0}", BoolValue(this.Events.HasFlag(FbServiceTraceEvents.ServiceQuery)));
sb.AppendFormat("log_service_query {0}", WriteBoolValue(this.Events.HasFlag(FbServiceTraceEvents.ServiceQuery)));
sb.AppendLine();
sb.AppendFormat("log_errors {0}", BoolValue(this.Events.HasFlag(FbServiceTraceEvents.Errors)));
sb.AppendFormat("log_errors {0}", WriteBoolValue(this.Events.HasFlag(FbServiceTraceEvents.Errors)));
sb.AppendLine();
sb.AppendLine("</services>");
return sb.ToString();
Expand Down
22 changes: 21 additions & 1 deletion NETProvider/source/FirebirdSql/Data/Services/FbTraceConfiguration.cs
View file
Expand Up @@ -26,9 +26,29 @@ namespace FirebirdSql.Data.Services
{
public abstract class FbTraceConfiguration
{
protected static string BoolValue(bool b)
protected static string WriteBoolValue(bool b)
{
return b ? "true" : "false";
}

protected static string WriteString(string s)
{
return string.Format("'{0}'", s);
}

protected static string WriteNumber(int i)
{
return i.ToString();
}

protected static string WriteNumber(uint i)
{
return i.ToString();
}

protected static string WriteRegEx(string re)
{
return WriteString(re.Replace(@"\", @"\\").Replace("'", @"\'"));
}
}
}

0 comments on commit 96f92bc

Please sign in to comment.