Skip to content

Commit

Permalink
utils/kamctl: fix dbtestdb
Browse files Browse the repository at this point in the history
some indentantion errors introduced at bc8bdca

related #1747

(cherry picked from commit b722a48)
(cherry picked from commit c4dd321)
  • Loading branch information
linuxmaniac committed May 4, 2020
1 parent 23062ed commit a2660fb
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions utils/kamctl/dbtextdb/dbtextdb.py
Expand Up @@ -146,11 +146,11 @@ def _ParseColumns(self):
# check if there is a function modifier on the columns
if self.tokens[0] == 'COUNT':
self.count = True
if col_end == 1:
raise ParseError('COUNT must be followed by column name[s]')
if not self.tokens[1].startswith(self._paren_placeholder):
raise ParseError('COUNT must be followed by ()')
cols_str = self._ReplaceParens(self.tokens[1])
if col_end == 1:
raise ParseError('COUNT must be followed by column name[s]')
if not self.tokens[1].startswith(self._paren_placeholder):
raise ParseError('COUNT must be followed by ()')
cols_str = self._ReplaceParens(self.tokens[1])

cols = cols_str.split(',')
for col in cols:
Expand Down Expand Up @@ -300,7 +300,7 @@ def _ParseTargets(self):
if self.tokens.pop(0) != 'SET':
raise ParseError('UPDATE command must be followed by SET')

self.targets = self._ParsePairs(' '.join(self.tokens), ',')
self.targets = self._ParsePairs(' '.join(self.tokens), ',')

# INSERT
if self.command == 'INSERT':
Expand Down Expand Up @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode):
string = '%s%s' % (string, c)
continue # wait for matching delim

started -= 1
if not started:
values.append(string)
new_args = '%s %s' % (new_args, '%s%d' % (placeholder,
my_id))
my_id += 1
string = ''
started -= 1
if not started:
values.append(string)
new_args = '%s %s' % (new_args, '%s%d' % (placeholder,
my_id))
my_id += 1
string = ''

else:
if not started:
new_args = '%s%s' % (new_args, c)
else:
string = '%s%s' % (string, c)
if not started:
new_args = '%s%s' % (new_args, c)
else:
string = '%s%s' % (string, c)

if started:
if mode == 'parens':
Expand Down Expand Up @@ -714,8 +714,8 @@ def _RunInsert(self):
elif self.header[col]['auto']:
new_row[col] = self._GetNextAuto(col)

else:
raise ExecuteError(col + ' cannot be empty or null')
else:
raise ExecuteError(col + ' cannot be empty or null')

self.data.append(new_row)
return [1]
Expand Down

0 comments on commit a2660fb

Please sign in to comment.