openstack
/
congress
Code Issues Proposed changes

Wrong error message 

Error message while passing more than one value to column name or
number always says "two values for column name/number provided",
even if more than two values are passed.
This PS changes message to "multiple values were provided".

Change-Id: I3ccb76c2ab447b6aaeca084a1f9d00a5e7a459d0
Closes-Bug: #1756789
This commit is contained in:
akhiljain23 2018-07-05 12:38:24 +05:30
parent d6ea3cb42b
commit 82a6309890
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
congress/datalog/compile.py
View File

@ -2115,7 +2115,7 @@ class DatalogSyntax(object):
name = param.children[0].children[0].getText()
if name in reference_args:
errors.append(exception.PolicyException(
"In atom {} two values for column name {} "
"In atom {} multiple values for column name {} "
"were provided".format(atomstr, name)))
reference_args[name] = self.create_term(param.children[1])
else:
@ -2124,7 +2124,7 @@ class DatalogSyntax(object):
number = int(param.children[0].children[0].getText())
if number in reference_args:
errors.append(exception.PolicyException(
"In atom {} two values for column number {} "
"In atom {} multiple values for column number {} "
"were provided.".format(atomstr, str(number))))
reference_args[number] = self.create_term(param.children[1])
if number < len(position_args):

4
congress/tests/datalog/test_compiler.py
View File

@ -246,12 +246,12 @@ class TestColumnReferences(base.TestCase):
check_err(
'p(x) :- nova:q(id=x, status=x, id=y)',
'two values for column name id',
'multiple values for column name id',
'Multiple values for column name')
check_err(
'p(x) :- nova:q(4=y, id=w, 4=z)',
'two values for column number 4',
'multiple values for column number 4',
'Multiple values for column number')
check_err(