cqle: Handle and return descriptive error for unknown table option

aholmberg · aholmberg · commit 3fdf3fb451f2 · 2015-10-09T15:02:59.000-05:00
PYTHON-406
diff --git a/cassandra/cqlengine/management.py b/cassandra/cqlengine/management.py
@@ -422,7 +422,10 @@ def _update_options(model):
 
     update_options = {}
     for name, value in model_options.items():
-        existing_value = existing_options[name]
+        try:
+            existing_value = existing_options[name]
+        except KeyError:
+            raise KeyError("Invalid table option: '%s'; known options: %s" % (name, existing_options.keys()))
         if isinstance(existing_value, six.string_types):
             if value != existing_value:
                 update_options[name] = value
diff --git a/tests/integration/cqlengine/management/test_management.py b/tests/integration/cqlengine/management/test_management.py
@@ -217,6 +217,15 @@ def test_table_property_update(self):
 
         self.assertDictContainsSubset(ModelWithTableProperties.__options__, table_options)
 
+    def test_bogus_option_update(self):
+        sync_table(ModelWithTableProperties)
+        option = 'no way will this ever be an option'
+        try:
+            ModelWithTableProperties.__options__[option] = 'what was I thinking?'
+            self.assertRaisesRegexp(KeyError, "Invalid table option.*%s.*" % option, sync_table, ModelWithTableProperties)
+        finally:
+            ModelWithTableProperties.__options__.pop(option, None)
+
 
 class SyncTableTests(BaseCassEngTestCase):
 
