From 11e217203c3d6523a03fbdd7fdff8d04494038e6 Mon Sep 17 00:00:00 2001
From: Blake Eggleston <blake@blake-desktop.(none)>
Date: Sun, 25 Nov 2012 14:44:05 -0800
Subject: [PATCH] refactoring BaseColumn name

---
 cqlengine/columns.py | 28 ++++++++++++++--------------
 cqlengine/models.py  |  1 +
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/cqlengine/columns.py b/cqlengine/columns.py
index b6266600..98abb965 100644
--- a/cqlengine/columns.py
+++ b/cqlengine/columns.py
@@ -35,7 +35,7 @@ class BaseValueManager(object):
         else:
             return property(_get, _set)
 
-class BaseColumn(object):
+class Column(object):
 
     #the cassandra type this column maps to
     db_type = None
@@ -64,8 +64,8 @@ class BaseColumn(object):
         self.value = None
 
         #keep track of instantiation order
-        self.position = BaseColumn.instance_counter
-        BaseColumn.instance_counter += 1
+        self.position = Column.instance_counter
+        Column.instance_counter += 1
 
     def validate(self, value):
         """
@@ -136,16 +136,16 @@ class BaseColumn(object):
         """ Returns the name of the cql index """
         return 'index_{}'.format(self.db_field_name)
 
-class Bytes(BaseColumn):
+class Bytes(Column):
     db_type = 'blob'
 
-class Ascii(BaseColumn):
+class Ascii(Column):
     db_type = 'ascii'
 
-class Text(BaseColumn):
+class Text(Column):
     db_type = 'text'
 
-class Integer(BaseColumn):
+class Integer(Column):
     db_type = 'int'
 
     def validate(self, value):
@@ -161,13 +161,13 @@ class Integer(BaseColumn):
     def to_database(self, value):
         return self.validate(value)
 
-class DateTime(BaseColumn):
+class DateTime(Column):
     db_type = 'timestamp'
     def __init__(self, **kwargs):
         super(DateTime, self).__init__(**kwargs)
         raise NotImplementedError
 
-class UUID(BaseColumn):
+class UUID(Column):
     """
     Type 1 or 4 UUID
     """
@@ -186,7 +186,7 @@ class UUID(BaseColumn):
             raise ValidationError("{} is not a valid uuid".format(value))
         return _UUID(val)
 
-class Boolean(BaseColumn):
+class Boolean(Column):
     db_type = 'boolean'
 
     def to_python(self, value):
@@ -195,7 +195,7 @@ class Boolean(BaseColumn):
     def to_database(self, value):
         return bool(value)
 
-class Float(BaseColumn):
+class Float(Column):
     db_type = 'double'
 
     def validate(self, value):
@@ -210,20 +210,20 @@ class Float(BaseColumn):
     def to_database(self, value):
         return self.validate(value)
 
-class Decimal(BaseColumn):
+class Decimal(Column):
     db_type = 'decimal'
     #TODO: decimal field
     def __init__(self, **kwargs):
         super(DateTime, self).__init__(**kwargs)
         raise NotImplementedError
 
-class Counter(BaseColumn):
+class Counter(Column):
     #TODO: counter field
     def __init__(self, **kwargs):
         super(Counter, self).__init__(**kwargs)
         raise NotImplementedError
 
-class ForeignKey(BaseColumn):
+class ForeignKey(Column):
     #TODO: Foreign key field
     def __init__(self, **kwargs):
         super(ForeignKey, self).__init__(**kwargs)
diff --git a/cqlengine/models.py b/cqlengine/models.py
index b17df09f..7b5dc707 100644
--- a/cqlengine/models.py
+++ b/cqlengine/models.py
@@ -103,6 +103,7 @@ class ModelMetaClass(type):
             k,v = 'id', columns.UUID(primary_key=True)
             column_definitions = [(k,v)] + column_definitions
 
+        #TODO: check that the defined columns don't conflict with any of the Model API's existing attributes/methods
         #transform column definitions
         for k,v in column_definitions:
             if pk_name is None and v.primary_key: