openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Bind non-prepared batch subqueries client-side

Browse Source
This commit is contained in:
Tyler Hobbs
2014-03-06 16:55:52 -06:00
parent 5cb501d625
commit 335e6001f1
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cassandra/query.py
View File

@@ -356,20 +356,20 @@ class BatchStatement(Statement):
def add(self, statement, parameters=None): def add(self, statement, parameters=None):
if isinstance(statement, basestring): if isinstance(statement, basestring):
if parameters: if parameters:
self._statements_and_parameters.append( statement = bind_params(statement, parameters)
(statement, encode_params(parameters)))
else:
self._statements_and_parameters.append((statement, ())) self._statements_and_parameters.append((statement, ()))
else: else:
try: try:
# see if it's a PreparedStatement # see if it's a PreparedStatement
string_or_id = statement.query_id query_id = statement.query_id
self._statements_and_parameters.append(
(query_id, () if parameters is None else parameters))
except AttributeError: except AttributeError:
# it must be a SimpleStatement # it must be a SimpleStatement
string_or_id = statement.query_string query_string = statement.query_string
if parameters:
parameters = () if parameters is None else parameters query_string = bind_params(query_string, parameters)
self._statements_and_parameters.append((string_or_id, parameters)) self._statements_and_parameters.append((query_string, ()))
return self return self
def add_all(self, statements, parameters): def add_all(self, statements, parameters):