This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 720a1b2704f97d20300cc743b4223557e2c0c12c
Merge: 9da4bd412d e9ea2772dd
Author: Stefan Miklosovic <smikloso...@apache.org>
AuthorDate: Tue Sep 24 14:38:14 2024 +0200
Merge branch 'cassandra-5.0' into trunk
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 15 +++++++++------
pylib/cqlshlib/cqlshmain.py | 19 -------------------
pylib/cqlshlib/test/test_cql_parsing.py | 25 +++++++++++++++++++++++++
4 files changed, 35 insertions(+), 25 deletions(-)
diff --cc pylib/cqlshlib/cqlshmain.py
index 94abcd6764,e3a2c14ae4..2cac58ef22
--- a/pylib/cqlshlib/cqlshmain.py
+++ b/pylib/cqlshlib/cqlshmain.py
@@@ -758,9 -820,8 +740,8 @@@ class Shell(cmd.Cmd)
Returns true if the statement is complete and was handled (meaning it
can be reset).
"""
- statementtext = self.strip_comment_blocks(statementtext)
try:
- statements, endtoken_escaped =
cqlruleset.cql_split_statements(statementtext)
+ statements, endtoken_escaped =
ruleset.cql_split_statements(statementtext)
except pylexotron.LexingError as e:
if self.show_line_nums:
self.printerr('Invalid syntax at line {0}, char {1}'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
