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

Removed unused parameters from PreparedStatement init

Browse Source
This commit is contained in:
Adam Holmberg
2015-04-16 15:34:42 -05:00
parent 37677993fa
commit f5d5f905e7
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cassandra/query.py
View File

@@ -338,19 +338,14 @@ class PreparedStatement(object):
fetch_size = FETCH_SIZE_UNSET fetch_size = FETCH_SIZE_UNSET
def __init__(self, column_metadata, query_id, routing_key_indexes, query, keyspace, def __init__(self, column_metadata, query_id, routing_key_indexes, query,
protocol_version, consistency_level=None, serial_consistency_level=None, keyspace, protocol_version):
fetch_size=FETCH_SIZE_UNSET):
self.column_metadata = column_metadata self.column_metadata = column_metadata
self.query_id = query_id self.query_id = query_id
self.routing_key_indexes = routing_key_indexes self.routing_key_indexes = routing_key_indexes
self.query_string = query self.query_string = query
self.keyspace = keyspace self.keyspace = keyspace
self.protocol_version = protocol_version self.protocol_version = protocol_version
self.consistency_level = consistency_level
self.serial_consistency_level = serial_consistency_level
if fetch_size is not FETCH_SIZE_UNSET:
self.fetch_size = fetch_size
@classmethod @classmethod
def from_message(cls, query_id, column_metadata, pk_indexes, cluster_metadata, query, prepared_keyspace, protocol_version): def from_message(cls, query_id, column_metadata, pk_indexes, cluster_metadata, query, prepared_keyspace, protocol_version):

9
tests/unit/test_parameter_binding.py
View File

@@ -128,8 +128,8 @@ class BoundStatementTestCase(unittest.TestCase):
routing_key_indexes=[], routing_key_indexes=[],
query=None, query=None,
keyspace=keyspace, keyspace=keyspace,
protocol_version=2, protocol_version=2)
fetch_size=1234) prepared_statement.fetch_size = 1234
bound_statement = BoundStatement(prepared_statement=prepared_statement) bound_statement = BoundStatement(prepared_statement=prepared_statement)
self.assertEqual(1234, bound_statement.fetch_size) self.assertEqual(1234, bound_statement.fetch_size)
@@ -147,10 +147,9 @@ class BoundStatementTestCase(unittest.TestCase):
routing_key_indexes=[0, 1], routing_key_indexes=[0, 1],
query=None, query=None,
keyspace=keyspace, keyspace=keyspace,
protocol_version=2, protocol_version=2)
fetch_size=1234)
self.assertRaises(ValueError, prepared_statement.bind, (1,)) self.assertRaises(ValueError, prepared_statement.bind, (1,))
bound = prepared_statement.bind((1,2)) bound = prepared_statement.bind((1, 2))
self.assertEqual(bound.keyspace, keyspace) self.assertEqual(bound.keyspace, keyspace)