Skip to content

Commit 09cf6f3

Browse files
authored
Merge pull request #17 from SlicingDice/feature/correct-data-extraction-validator
Correct data extraction validator
2 parents 150abc5 + 03aec2e commit 09cf6f3

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## [2.0.2]
4+
### Updated
5+
- Correct data extraction validator to accept columns: all
6+
37
## [2.0.1]
48
### Updated
59
- Update data extraction validator to support order parameter

lib/rbslicer/exceptions.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ class IndexEntitiesLimitException < SlicingDiceException; end
2929

3030
class IndexColumnsLimitException < SlicingDiceException; end
3131

32+
class InvalidQueryException < SlicingDiceException; end
33+
3234
end

lib/rbslicer/utils/validators.rb

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,10 @@ def valid_keys?
181181
end
182182
elsif key == "columns"
183183
if !value.is_a?(Array)
184-
raise Exceptions::InvalidQueryException, 'The key \'columns\' in '\
185-
'query has a invalid value.'
184+
if value != "all"
185+
raise Exceptions::InvalidQueryException, 'The key \'columns\' in '\
186+
'query has a invalid value.'
187+
end
186188
else
187189
if value.length > 10
188190
raise Exceptions::MaxLimitException, 'The key \'columns\' in '\
@@ -201,7 +203,7 @@ def valid_keys?
201203
end
202204
else
203205
raise Exceptions::InvalidQueryException, "This query have the invalid"\
204-
"key #{key}"
206+
" key #{key}"
205207
end
206208
end
207209
true

0 commit comments

Comments
 (0)