chore: refactor for sonarqube issues

2026-05-22 17:13:31 -05:00
parent 063d5a7ba0
commit 012e693fe1
22 changed files with 522 additions and 461 deletions
@@ -132,80 +132,7 @@ public class DeleteBreakdown : SqlBreakdownBase

        try
        {
-            if (string.IsNullOrWhiteSpace(sql))
-            {
-                errorMessage = "SQL statement cannot be null or empty.";
-                return false;
-            }
-
-            var parser = new StatementParser();
-            sql = parser.NormalizeSqlPreservingComments(sql);
-
-            // Check if it's a DELETE statement
-            var sqlTrimmed = sql.TrimStart();
-            if (!System.Text.RegularExpressions.Regex.IsMatch(sqlTrimmed, @"^\s*DELETE\b",
-                System.Text.RegularExpressions.RegexOptions.IgnoreCase, Strata.SqlTools.SqlBreakdown.Utilities.RegexDefaults.MatchTimeout))
-            {
-                errorMessage = "SQL statement must start with DELETE.";
-                return false;
-            }
-
-            // Extract setup and finish clauses
-            var setupClauses = new List<string>();
-            sql = parser.ExtractSetupClauses(sql, setupClauses);
-
-            var finishClauses = new ArrayList();
-            sql = parser.ExtractFinishClauses(sql, finishClauses);
-
-            // Parse DELETE statement using regex
-            // Pattern: DELETE [table_alias] FROM table WHERE condition
-            var deleteMatch = System.Text.RegularExpressions.Regex.Match(sql,
-                @"DELETE\s+(.*?)\s+FROM\s+(.*?)(?:\s+WHERE\s+(.*))?$",
-                System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.Singleline, Strata.SqlTools.SqlBreakdown.Utilities.RegexDefaults.MatchTimeout);
-
-            if (!deleteMatch.Success)
-            {
-                // Try simpler pattern: DELETE FROM table WHERE condition
-                deleteMatch = System.Text.RegularExpressions.Regex.Match(sql,
-                    @"DELETE\s+FROM\s+(.*?)(?:\s+WHERE\s+(.*))?$",
-                    System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.Singleline, Strata.SqlTools.SqlBreakdown.Utilities.RegexDefaults.MatchTimeout);
-
-                if (!deleteMatch.Success)
-                {
-                    errorMessage = "Could not parse DELETE statement. Expected format: DELETE [alias] FROM table [WHERE condition]";
-                    return false;
-                }
-
-                var fromClause = deleteMatch.Groups[1].Value.Trim();
-                var whereClause = deleteMatch.Groups.Count > 2 ? deleteMatch.Groups[2].Value.Trim() : string.Empty;
-
-                result = new DeleteBreakdown(fromClause, whereClause)
-                {
-                    SetupClauses = setupClauses,
-                    FinishClauses = finishClauses
-                };
-            }
-            else
-            {
-                var deleteClause = deleteMatch.Groups[1].Value.Trim();
-                var fromClause = deleteMatch.Groups[2].Value.Trim();
-                var whereClause = deleteMatch.Groups.Count > 3 ? deleteMatch.Groups[3].Value.Trim() : string.Empty;
-
-                result = new DeleteBreakdown(fromClause, whereClause)
-                {
-                    SetupClauses = setupClauses,
-                    FinishClauses = finishClauses
-                };
-
-                if (!string.IsNullOrWhiteSpace(deleteClause))
-                {
-                    var cleanDelete = parser.ExtractSqlComments(deleteClause, out var deleteComments);
-                    result.DeleteClause.Clause = cleanDelete.Trim();
-                    result.DeleteClause.Comment = deleteComments.Count > 0 ? string.Join(" ", deleteComments) : null;
-                }
-            }
-
-            return true;
+            return TryParseCore(sql, out result, out errorMessage);
        }
        catch (Exception ex)
        {
@@ -214,5 +141,96 @@ public class DeleteBreakdown : SqlBreakdownBase
        }
    }

+    private static bool TryParseCore(string sql, out DeleteBreakdown result, out string errorMessage)
+    {
+        result = null!;
+        errorMessage = null!;
+
+        if (string.IsNullOrWhiteSpace(sql))
+        {
+            errorMessage = "SQL statement cannot be null or empty.";
+            return false;
+        }
+
+        var parser = new StatementParser();
+        sql = parser.NormalizeSqlPreservingComments(sql);
+
+        // Check if it's a DELETE statement
+        var sqlTrimmed = sql.TrimStart();
+        if (!System.Text.RegularExpressions.Regex.IsMatch(sqlTrimmed, @"^\s*DELETE\b",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase, Strata.SqlTools.SqlBreakdown.Utilities.RegexDefaults.MatchTimeout))
+        {
+            errorMessage = "SQL statement must start with DELETE.";
+            return false;
+        }
+
+        // Extract setup and finish clauses
+        var setupClauses = new List<string>();
+        sql = parser.ExtractSetupClauses(sql, setupClauses);
+
+        var finishClauses = new ArrayList();
+        sql = parser.ExtractFinishClauses(sql, finishClauses);
+
+        // Parse DELETE statement using regex
+        // Pattern: DELETE [table_alias] FROM table WHERE condition
+        var deleteMatch = System.Text.RegularExpressions.Regex.Match(sql,
+            @"DELETE\s+(.*?)\s+FROM\s+(.*?)(?:\s+WHERE\s+(.*))?$",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.Singleline, Strata.SqlTools.SqlBreakdown.Utilities.RegexDefaults.MatchTimeout);
+
+        if (deleteMatch.Success)
+        {
+            var deleteClause = deleteMatch.Groups[1].Value.Trim();
+            var fromClause = deleteMatch.Groups[2].Value.Trim();
+            var whereClause = deleteMatch.Groups.Count > 3 ? deleteMatch.Groups[3].Value.Trim() : string.Empty;
+
+            result = new DeleteBreakdown(fromClause, whereClause)
+            {
+                SetupClauses = setupClauses,
+                FinishClauses = finishClauses
+            };
+
+            ApplyDeleteClauseComments(result, parser, deleteClause);
+            return true;
+        }
+
+        // Try simpler pattern: DELETE FROM table WHERE condition
+        deleteMatch = System.Text.RegularExpressions.Regex.Match(sql,
+            @"DELETE\s+FROM\s+(.*?)(?:\s+WHERE\s+(.*))?$",
+            System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.Singleline, Strata.SqlTools.SqlBreakdown.Utilities.RegexDefaults.MatchTimeout);
+
+        if (!deleteMatch.Success)
+        {
+            errorMessage = "Could not parse DELETE statement. Expected format: DELETE [alias] FROM table [WHERE condition]";
+            return false;
+        }
+
+        var simpleFromClause = deleteMatch.Groups[1].Value.Trim();
+        var simpleWhereClause = deleteMatch.Groups.Count > 2 ? deleteMatch.Groups[2].Value.Trim() : string.Empty;
+
+        result = new DeleteBreakdown(simpleFromClause, simpleWhereClause)
+        {
+            SetupClauses = setupClauses,
+            FinishClauses = finishClauses
+        };
+
+        return true;
+    }
+
+    /// <summary>
+    /// Extracts inline comments from the DELETE clause text and applies the cleaned value and
+    /// combined comment to <paramref name="result"/>. No-op when the clause is blank.
+    /// </summary>
+    private static void ApplyDeleteClauseComments(DeleteBreakdown result, StatementParser parser, string deleteClause)
+    {
+        if (string.IsNullOrWhiteSpace(deleteClause))
+        {
+            return;
+        }
+
+        var cleanDelete = parser.ExtractSqlComments(deleteClause, out var deleteComments);
+        result.DeleteClause.Clause = cleanDelete.Trim();
+        result.DeleteClause.Comment = deleteComments.Count > 0 ? string.Join(" ", deleteComments) : null;
+    }
+
    #endregion
 }