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

fix static column detection

Browse Source
This commit is contained in:
Tommaso Barbugli
2014-09-07 19:26:44 +02:00
parent 5f8a46a7f4
commit e6beb34647
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cqlengine/management.py
View File

@@ -236,16 +236,15 @@ def get_fields(model):
# returns all fields that aren't part of the PK # returns all fields that aren't part of the PK
ks_name = model._get_keyspace() ks_name = model._get_keyspace()
col_family = model.column_family_name(include_keyspace=False) col_family = model.column_family_name(include_keyspace=False)
field_types = ['regular', 'static']
query = "select * from system.schema_columns where keyspace_name = %s and columnfamily_name = %s" query = "select * from system.schema_columns where keyspace_name = %s and columnfamily_name = %s"
tmp = execute(query, [ks_name, col_family]) tmp = execute(query, [ks_name, col_family])
# Tables containing only primary keys do not appear to create # Tables containing only primary keys do not appear to create
# any entries in system.schema_columns, as only non-primary-key attributes # any entries in system.schema_columns, as only non-primary-key attributes
# appear to be inserted into the schema_columns table # appear to be inserted into the schema_columns table
try: try:
return [Field(x['column_name'], x['validator']) for x in tmp if x['type'] == 'regular'] return [Field(x['column_name'], x['validator']) for x in tmp if x['type'] in field_types]
except KeyError: except KeyError:
return [Field(x['column_name'], x['validator']) for x in tmp] return [Field(x['column_name'], x['validator']) for x in tmp]
# convert to Field named tuples # convert to Field named tuples