changing the create_column_family and delete_column_family management functions to create_table and delete_table, respectively

README.md

@@ -36,8 +36,8 @@ pip install cqlengine
 >>> connection.setup(['127.0.0.1:9160'])
 
 #...and create your CQL table
->>> from cqlengine.management import create_column_family
+>>> from cqlengine.management import create_table
->>> create_column_family(ExampleModel)
+>>> create_table(ExampleModel)
 
 #now we can create some rows:
 >>> em1 = ExampleModel.create(example_type=0, description="example1")

changelog

@@ -1,6 +1,8 @@
 CHANGELOG
 
 0.0.4-ALPHA (in progress)
+* changing create_column_family management function to create_table
+* changing delete_column_family management function to delete_table
 * added partition key validation to QuerySet delete method
 * added .get() method to QuerySet
 * added create method shortcut to the model class

cqlengine/management.py

@@ -12,7 +12,7 @@ def delete_keyspace(name):
         if name in [k.name for k in con.con.client.describe_keyspaces()]:
             con.execute("DROP KEYSPACE {}".format(name))
 
-def create_column_family(model, create_missing_keyspace=True):
+def create_table(model, create_missing_keyspace=True):
     #construct query string
     cf_name = model.column_family_name()
     raw_cf_name = model.column_family_name(include_keyspace=False)
@@ -56,7 +56,7 @@ def create_column_family(model, create_missing_keyspace=True):
                 con.execute(qs)
 
 
-def delete_column_family(model):
+def delete_table(model):
     #check that model exists
     cf_name = model.column_family_name()
     raw_cf_name = model.column_family_name(include_keyspace=False)

cqlengine/tests/columns/test_validation.py

@@ -15,7 +15,7 @@ from cqlengine.columns import Boolean
 from cqlengine.columns import Float
 from cqlengine.columns import Decimal
 
-from cqlengine.management import create_column_family, delete_column_family
+from cqlengine.management import create_table, delete_table
 from cqlengine.models import Model
 
 class TestDatetime(BaseCassEngTestCase):
@@ -26,12 +26,12 @@ class TestDatetime(BaseCassEngTestCase):
     @classmethod
     def setUpClass(cls):
         super(TestDatetime, cls).setUpClass()
-        create_column_family(cls.DatetimeTest)
+        create_table(cls.DatetimeTest)
 
     @classmethod
     def tearDownClass(cls):
         super(TestDatetime, cls).tearDownClass()
-        delete_column_family(cls.DatetimeTest)
+        delete_table(cls.DatetimeTest)
 
     def test_datetime_io(self):
         now = datetime.now()
@@ -47,12 +47,12 @@ class TestDecimal(BaseCassEngTestCase):
     @classmethod
     def setUpClass(cls):
         super(TestDecimal, cls).setUpClass()
-        create_column_family(cls.DecimalTest)
+        create_table(cls.DecimalTest)
 
     @classmethod
     def tearDownClass(cls):
         super(TestDecimal, cls).tearDownClass()
-        delete_column_family(cls.DecimalTest)
+        delete_table(cls.DecimalTest)
 
     def test_datetime_io(self):
         dt = self.DecimalTest.objects.create(test_id=0, dec_val=D('0.00'))

cqlengine/tests/model/test_model_io.py

@@ -1,8 +1,8 @@
 from unittest import skip
 from cqlengine.tests.base import BaseCassEngTestCase
 
-from cqlengine.management import create_column_family
+from cqlengine.management import create_table
-from cqlengine.management import delete_column_family
+from cqlengine.management import delete_table
 from cqlengine.models import Model
 from cqlengine.models import Model
 from cqlengine import columns
@@ -16,12 +16,12 @@ class TestModelIO(BaseCassEngTestCase):
     @classmethod
     def setUpClass(cls):
         super(TestModelIO, cls).setUpClass()
-        create_column_family(TestModel)
+        create_table(TestModel)
 
     @classmethod
     def tearDownClass(cls):
         super(TestModelIO, cls).tearDownClass()
-        delete_column_family(TestModel)
+        delete_table(TestModel)
 
     def test_model_save_and_load(self):
         """

cqlengine/tests/query/test_queryset.py

@@ -1,8 +1,8 @@
 from cqlengine.tests.base import BaseCassEngTestCase
 
 from cqlengine.exceptions import ModelException
-from cqlengine.management import create_column_family
+from cqlengine.management import create_table
-from cqlengine.management import delete_column_family
+from cqlengine.management import delete_table
 from cqlengine.models import Model
 from cqlengine import columns
 from cqlengine import query
@@ -106,10 +106,10 @@ class BaseQuerySetUsage(BaseCassEngTestCase):
     @classmethod
     def setUpClass(cls):
         super(BaseQuerySetUsage, cls).setUpClass()
-        delete_column_family(TestModel)
+        delete_table(TestModel)
-        delete_column_family(IndexedTestModel)
+        delete_table(IndexedTestModel)
-        create_column_family(TestModel)
+        create_table(TestModel)
-        create_column_family(IndexedTestModel)
+        create_table(IndexedTestModel)
 
         TestModel.objects.create(test_id=0, attempt_id=0, description='try1', expected_result=5, test_result=30)
         TestModel.objects.create(test_id=0, attempt_id=1, description='try2', expected_result=10, test_result=30)
@@ -144,8 +144,8 @@ class BaseQuerySetUsage(BaseCassEngTestCase):
     @classmethod
     def tearDownClass(cls):
         super(BaseQuerySetUsage, cls).tearDownClass()
-        delete_column_family(TestModel)
+        delete_table(TestModel)
-        delete_column_family(IndexedTestModel)
+        delete_table(IndexedTestModel)
 
 class TestQuerySetCountSelectionAndIteration(BaseQuerySetUsage):