+4
-14
lines changedFilter options
+4
-14
lines changed Original file line number Diff line number Diff line change
@@ -185,7 +185,6 @@ def _update_table(self, meta):
185 185
# return one or the other based on the query results.
186 186
# Here we deal with that.
187 187
if isinstance(meta, TableMetadata):
188 -
meta.keyspace = keyspace_meta # temporary while TableMetadata.keyspace is deprecated
189 188
keyspace_meta._add_table_metadata(meta)
190 189
else:
191 190
keyspace_meta._add_view_metadata(meta)
@@ -952,14 +951,6 @@ class TableMetadata(object):
952 951
A representation of the schema for a single table.
953 952
"""
954 953 955 -
keyspace = None
956 -
"""
957 -
An instance of :class:`~.KeyspaceMetadata`.
958 - 959 -
.. deprecated:: 2.7.0
960 - 961 -
"""
962 - 963 954
keyspace_name = None
964 955
""" String name of this Table's keyspace """
965 956
@@ -1348,13 +1339,13 @@ def as_cql_query(self):
1348 1339 1349 1340
return "CREATE INDEX %s ON %s.%s (%s)" % (
1350 1341
self.name, # Cassandra doesn't like quoted index names for some reason
1351 -
protect_name(table.keyspace.name),
1342 +
protect_name(table.keyspace_name),
1352 1343
protect_name(table.name),
1353 1344
index_target)
1354 1345
else:
1355 1346
return "CREATE CUSTOM INDEX %s ON %s.%s (%s) USING '%s'" % (
1356 1347
self.name, # Cassandra doesn't like quoted index names for some reason
1357 -
protect_name(table.keyspace.name),
1348 +
protect_name(table.keyspace_name),
1358 1349
protect_name(table.name),
1359 1350
protect_name(self.column.name),
1360 1351
self.index_options["class_name"])
@@ -1556,7 +1547,7 @@ def __init__(self, table_metadata, trigger_name, options=None):
1556 1547
def as_cql_query(self):
1557 1548
ret = "CREATE TRIGGER %s ON %s.%s USING %s" % (
1558 1549
protect_name(self.name),
1559 -
protect_name(self.table.keyspace.name),
1550 +
protect_name(self.table.keyspace_name),
1560 1551
protect_name(self.table.name),
1561 1552
protect_value(self.options['class'])
1562 1553
)
@@ -1644,7 +1635,6 @@ def get_all_keyspaces(self):
1644 1635
try:
1645 1636
for table_row in self.keyspace_table_rows.get(keyspace_meta.name, []):
1646 1637
table_meta = self._build_table_metadata(table_row)
1647 -
table_meta.keyspace = keyspace_meta # temporary while TableMetadata.keyspace is deprecated
1648 1638
keyspace_meta._add_table_metadata(table_meta)
1649 1639 1650 1640
for usertype_row in self.keyspace_type_rows.get(keyspace_meta.name, []):
@@ -126,7 +126,7 @@ def test_basic_table_meta_properties(self):
126 126 127 127
self.assertTrue(self.cfname in ksmeta.tables)
128 128
tablemeta = ksmeta.tables[self.cfname]
129 -
self.assertEqual(tablemeta.keyspace, ksmeta) # tablemeta.keyspace is deprecated
129 +
self.assertEqual(tablemeta.keyspace_name, ksmeta.name)
130 130
self.assertEqual(tablemeta.name, self.cfname)
131 131 132 132
self.assertEqual([u'a'], [c.name for c in tablemeta.partition_key])
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4