Unify exception types for invalid operators and combinators

coldbox-modules · May 9, 2016 · c4b9d68 · c4b9d68
1 parent 623517f
commit c4b9d68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/models/Query/Builder.cfc b/models/Query/Builder.cfc
@@ -137,7 +137,7 @@ component displayname='Builder' {
         }
         else if (isInvalidCombinator(arguments.combinator)) {
             throw(
-                type = 'InvalidArgumentException',
+                type = 'InvalidSQLType',
                 message = 'Illegal combinator'
             );
         }
@@ -148,7 +148,7 @@ component displayname='Builder' {
         }
         else if (isInvalidOperator(arguments.operator)) {
             throw(
-                type = 'InvalidArgumentException',
+                type = 'InvalidSQLType',
                 message = 'Illegal operator'
             );
         }

diff --git a/models/Query/JoinClause.cfc b/models/Query/JoinClause.cfc
@@ -26,7 +26,7 @@ component displayname='JoinClause' {
         required string table
     ) {
         if (! arrayContainsNoCase(types, arguments.type)) {
-            throw('[#type#] is not a valid sql join type');
+            throw(type = 'InvalidSQLType', message = '[#type#] is not a valid sql join type');
         }
 
         variables.type = arguments.type;
@@ -46,7 +46,7 @@ component displayname='JoinClause' {
         }
 
         if (! arrayContainsNoCase(operators, arguments.operator)) {
-            throw('[#operator#] is not a valid sql operator type');
+            throw(type = 'InvalidSQLType', message = '[#operator#] is not a valid sql operator type');
         }
 
         if (arguments.where) {