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

renamed some exceptions

Browse Source
This commit is contained in:
Blake Eggleston
2012-11-10 19:33:22 -08:00
parent 2aaf1650f3
commit 18f52886e7
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cassandraengine/__init__.py
View File

@@ -0,0 +1,3 @@
from cassandraengine.columns import *
from cassandraengine.models import Model

3
cassandraengine/columns.py
View File

@@ -5,9 +5,6 @@ from uuid import uuid1, uuid4
from cassandraengine.exceptions import ValidationError from cassandraengine.exceptions import ValidationError
class BaseColumn(object): class BaseColumn(object):
"""
The base column
"""
#the cassandra type this column maps to #the cassandra type this column maps to
db_type = None db_type = None

2
cassandraengine/exceptions.py
View File

@@ -1,4 +1,4 @@
#cassandraengine exceptions #cassandraengine exceptions
class ColumnFamilyException(BaseException): pass class ModelException(BaseException): pass
class ValidationError(BaseException): pass class ValidationError(BaseException): pass

10
cassandraengine/models.py
View File

@@ -1,6 +1,6 @@
from cassandraengine import columns from cassandraengine import columns
from cassandraengine.exceptions import ColumnFamilyException from cassandraengine.exceptions import ModelException
from cassandraengine.manager import Manager from cassandraengine.manager import Manager
class BaseModel(object): class BaseModel(object):
@@ -8,6 +8,8 @@ class BaseModel(object):
The base model class, don't inherit from this, inherit from Model, defined below The base model class, don't inherit from this, inherit from Model, defined below
""" """
#table names will be generated automatically from it's model name and package
#however, you can alse define them manually here
db_name = None db_name = None
def __init__(self, **values): def __init__(self, **values):
@@ -75,7 +77,7 @@ class ModelMetaClass(type):
if isinstance(v, columns.BaseColumn): if isinstance(v, columns.BaseColumn):
if v.is_primary_key: if v.is_primary_key:
if pk_name: if pk_name:
raise ColumnFamilyException("More than one primary key defined for {}".format(name)) raise ModelException("More than one primary key defined for {}".format(name))
pk_name = k pk_name = k
_columns[k] = attrs.pop(k) _columns[k] = attrs.pop(k)
_columns[k].set_db_name(k) _columns[k].set_db_name(k)
@@ -96,8 +98,8 @@ class ModelMetaClass(type):
col_names = set() col_names = set()
for k,v in _columns.items(): for k,v in _columns.items():
if v.db_field in col_names: if v.db_field in col_names:
raise ColumnFamilyException("{} defines the column {} more than once".format(name, v.db_field)) raise ModelException("{} defines the column {} more than once".format(name, v.db_field))
col_names.add(k) col_names.add(v.db_field)
#get column family name #get column family name
cf_name = attrs.pop('db_name', None) or name cf_name = attrs.pop('db_name', None) or name