Merge pull request #24 from CodeWithCJ/dev

fix on sql logic

Author: CodeWithCJ

SparkyBudget/py_db/db_scripts/upgrade/SparkyBudget_Upgrade_v0.20.sql

@@ -53,7 +53,17 @@ BEGIN
 	 UPDATE F_Transaction
     SET SubCategory = (
         SELECT Default_SubCategory FROM (
-            SELECT Default_SubCategory, D_Category_Rule.AccountName
+            -- Specific Account, Exact Match (Highest Priority)
+            SELECT Default_SubCategory, D_Category_Rule.AccountName, D_Category_Rule.Rule_Pattern, 0 AS Priority
+            FROM D_Category_Rule
+            WHERE
+                LOWER(NEW.TransactionPayee) = LOWER(D_Category_Rule.Match_Word)
+                AND D_Category_Rule.Rule_Category = 'Payee'
+                AND D_Category_Rule.Rule_Pattern = 'Exact'
+                AND D_Category_Rule.AccountName = NEW.AccountName
+            UNION ALL
+            -- Specific Account, Contains Match
+            SELECT Default_SubCategory, D_Category_Rule.AccountName, D_Category_Rule.Rule_Pattern, 1 AS Priority
             FROM D_Category_Rule
             WHERE
                 (LOWER(NEW.TransactionPayee) LIKE '%' || LOWER(D_Category_Rule.Match_Word) || '%'
@@ -62,18 +72,27 @@ BEGIN
                 AND D_Category_Rule.Rule_Pattern = 'Contains'
                 AND D_Category_Rule.AccountName = NEW.AccountName
             UNION ALL
-            SELECT Default_SubCategory, D_Category_Rule.AccountName
+            -- ALL Accounts, Exact Match
+            SELECT Default_SubCategory, D_Category_Rule.AccountName, D_Category_Rule.Rule_Pattern, 2 AS Priority
+            FROM D_Category_Rule
+            WHERE
+                LOWER(NEW.TransactionPayee) = LOWER(D_Category_Rule.Match_Word)
+                AND D_Category_Rule.Rule_Category = 'Payee'
+                AND D_Category_Rule.Rule_Pattern = 'Exact'
+                AND D_Category_Rule.AccountName = 'ALL'
+            UNION ALL
+            -- ALL Accounts, Contains Match (Lowest Priority)
+            SELECT Default_SubCategory, D_Category_Rule.AccountName, D_Category_Rule.Rule_Pattern, 3 AS Priority
             FROM D_Category_Rule
             WHERE
                 (LOWER(NEW.TransactionPayee) LIKE '%' || LOWER(D_Category_Rule.Match_Word) || '%'
                  OR LOWER(D_Category_Rule.Match_Word) LIKE '%' || LOWER(NEW.TransactionPayee) || '%')
                 AND D_Category_Rule.Rule_Category = 'Payee'
                 AND D_Category_Rule.Rule_Pattern = 'Contains'
                 AND D_Category_Rule.AccountName = 'ALL'
-        )
+        ) AS SubQueryWithPattern
         ORDER BY
-            CASE WHEN AccountName = NEW.AccountName THEN 0 ELSE 1 END,
-            CASE WHEN Rule_Pattern = 'Exact' THEN 0 ELSE 1 END
+            SubQueryWithPattern.Priority ASC
         LIMIT 1
     )
     WHERE F_Transaction.TransactionID = NEW.TransactionID