From 786a21ad0d898dc225cd38dd0a23fb6503ef957c Mon Sep 17 00:00:00 2001 From: Blake Eggleston Date: Wed, 22 May 2013 11:46:01 -0700 Subject: [PATCH 1/5] changing ORM (object row mapper) to Object Mapper, to avoid any confusion regarding support for object relationships --- README.md | 2 +- docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3e5b06bf..7b244ffe 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ cqlengine =============== -cqlengine is a Cassandra CQL 3 ORM for Python with an interface similar to the Django orm and mongoengine +cqlengine is a Cassandra CQL 3 Object Mapper for Python with an interface similar to the Django orm and mongoengine [Documentation](https://cqlengine.readthedocs.org/en/latest/) diff --git a/docs/index.rst b/docs/index.rst index dbc64e54..6cea2f2c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -5,7 +5,7 @@ cqlengine documentation ======================= -cqlengine is a Cassandra CQL 3 ORM for Python with an interface similar to the Django orm and mongoengine +cqlengine is a Cassandra CQL 3 Object Mapper for Python with an interface similar to the Django orm and mongoengine :ref:`getting-started` From 4826f384823bc85d51a601b7b72a5624c2096249 Mon Sep 17 00:00:00 2001 From: Blake Eggleston Date: Sun, 26 May 2013 08:10:10 -0700 Subject: [PATCH 2/5] removing alpha from pypi info --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index af822166..860b6739 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,6 @@ setup( dependency_links = ['https://github.com/bdeggleston/cqlengine/archive/{0}.tar.gz#egg=cqlengine-{0}'.format(version)], long_description=long_desc, classifiers = [ - "Development Status :: 3 - Alpha", "Environment :: Web Environment", "Environment :: Plugins", "License :: OSI Approved :: BSD License", From d6b984b95223ce538274b3e8d420ef2c441564b7 Mon Sep 17 00:00:00 2001 From: Blake Eggleston Date: Sun, 26 May 2013 08:10:52 -0700 Subject: [PATCH 3/5] updating pypi description --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 860b6739..0f98baec 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ from setuptools import setup, find_packages version = '0.2' long_desc = """ -cqlengine is a Cassandra CQL ORM for Python in the style of the Django orm and mongoengine +cqlengine is a Cassandra CQL Object Mapper for Python in the style of the Django orm and mongoengine [Documentation](https://cqlengine.readthedocs.org/en/latest/) From bb3ea850f250f01cd68db2f77644fcd6c7b45fdc Mon Sep 17 00:00:00 2001 From: Blake Eggleston Date: Sun, 26 May 2013 08:16:21 -0700 Subject: [PATCH 4/5] adding test around deleting of model attributes --- cqlengine/tests/model/test_class_construction.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cqlengine/tests/model/test_class_construction.py b/cqlengine/tests/model/test_class_construction.py index 77b1d737..36aa11e9 100644 --- a/cqlengine/tests/model/test_class_construction.py +++ b/cqlengine/tests/model/test_class_construction.py @@ -117,7 +117,18 @@ class TestModelClassFunction(BaseCassEngTestCase): """ Test that metadata defined in one class, is not inherited by subclasses """ - + + def test_del_attribute_is_assigned_properly(self): + """ Tests that columns that can be deleted have the del attribute """ + class DelModel(Model): + key = columns.Integer(primary_key=True) + data = columns.Integer(required=False) + + model = DelModel(key=4, data=5) + del model.data + with self.assertRaises(AttributeError): + del model.key + class TestManualTableNaming(BaseCassEngTestCase): class RenamedTest(cqlengine.Model): From 929d1736eac5e1f03bab6184db7360a8d3b2a339 Mon Sep 17 00:00:00 2001 From: Pandu Rao Date: Sun, 26 May 2013 10:18:31 -0700 Subject: [PATCH 5/5] Fixed error in sample code in documentation --- docs/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 6cea2f2c..f93a8505 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -64,7 +64,7 @@ Getting Started >>> q.count() 4 >>> for instance in q: - >>> print q.description + >>> print instance.description example5 example6 example7 @@ -78,7 +78,7 @@ Getting Started >>> q2.count() 1 >>> for instance in q2: - >>> print q.description + >>> print instance.description example5