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

Remove deprecated TableMetadata.keyspace attribute

Browse Source
This commit is contained in:
Adam Holmberg
2015-10-06 11:47:16 -05:00
parent e16a073510
commit cc9407366a
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cassandra/metadata.py
View File

@@ -185,7 +185,6 @@ class Metadata(object):
# return one or the other based on the query results. # return one or the other based on the query results.
# Here we deal with that. # Here we deal with that.
if isinstance(meta, TableMetadata): if isinstance(meta, TableMetadata):
meta.keyspace = keyspace_meta # temporary while TableMetadata.keyspace is deprecated
keyspace_meta._add_table_metadata(meta) keyspace_meta._add_table_metadata(meta)
else: else:
keyspace_meta._add_view_metadata(meta) keyspace_meta._add_view_metadata(meta)
@@ -952,14 +951,6 @@ class TableMetadata(object):
A representation of the schema for a single table. A representation of the schema for a single table.
""" """
keyspace = None
"""
An instance of :class:`~.KeyspaceMetadata`.
.. deprecated:: 2.7.0
"""
keyspace_name = None keyspace_name = None
""" String name of this Table's keyspace """ """ String name of this Table's keyspace """
@@ -1348,13 +1339,13 @@ class IndexMetadata(object):
return "CREATE INDEX %s ON %s.%s (%s)" % ( return "CREATE INDEX %s ON %s.%s (%s)" % (
self.name, # Cassandra doesn't like quoted index names for some reason self.name, # Cassandra doesn't like quoted index names for some reason
protect_name(table.keyspace.name), protect_name(table.keyspace_name),
protect_name(table.name), protect_name(table.name),
index_target) index_target)
else: else:
return "CREATE CUSTOM INDEX %s ON %s.%s (%s) USING '%s'" % ( return "CREATE CUSTOM INDEX %s ON %s.%s (%s) USING '%s'" % (
self.name, # Cassandra doesn't like quoted index names for some reason self.name, # Cassandra doesn't like quoted index names for some reason
protect_name(table.keyspace.name), protect_name(table.keyspace_name),
protect_name(table.name), protect_name(table.name),
protect_name(self.column.name), protect_name(self.column.name),
self.index_options["class_name"]) self.index_options["class_name"])
@@ -1556,7 +1547,7 @@ class TriggerMetadata(object):
def as_cql_query(self): def as_cql_query(self):
ret = "CREATE TRIGGER %s ON %s.%s USING %s" % ( ret = "CREATE TRIGGER %s ON %s.%s USING %s" % (
protect_name(self.name), protect_name(self.name),
protect_name(self.table.keyspace.name), protect_name(self.table.keyspace_name),
protect_name(self.table.name), protect_name(self.table.name),
protect_value(self.options['class']) protect_value(self.options['class'])
) )
@@ -1644,7 +1635,6 @@ class SchemaParserV22(_SchemaParser):
try: try:
for table_row in self.keyspace_table_rows.get(keyspace_meta.name, []): for table_row in self.keyspace_table_rows.get(keyspace_meta.name, []):
table_meta = self._build_table_metadata(table_row) table_meta = self._build_table_metadata(table_row)
table_meta.keyspace = keyspace_meta # temporary while TableMetadata.keyspace is deprecated
keyspace_meta._add_table_metadata(table_meta) keyspace_meta._add_table_metadata(table_meta)
for usertype_row in self.keyspace_type_rows.get(keyspace_meta.name, []): for usertype_row in self.keyspace_type_rows.get(keyspace_meta.name, []):

2
tests/integration/standard/test_metadata.py
View File

@@ -126,7 +126,7 @@ class SchemaMetadataTests(unittest.TestCase):
self.assertTrue(self.cfname in ksmeta.tables) self.assertTrue(self.cfname in ksmeta.tables)
tablemeta = ksmeta.tables[self.cfname] tablemeta = ksmeta.tables[self.cfname]
self.assertEqual(tablemeta.keyspace, ksmeta) # tablemeta.keyspace is deprecated self.assertEqual(tablemeta.keyspace_name, ksmeta.name)
self.assertEqual(tablemeta.name, self.cfname) self.assertEqual(tablemeta.name, self.cfname)
self.assertEqual([u'a'], [c.name for c in tablemeta.partition_key]) self.assertEqual([u'a'], [c.name for c in tablemeta.partition_key])