fix removing last user type in proto [1,2]

aholmberg · aholmberg · commit a334ae51efcc · 2016-08-25T12:58:01.000-05:00
PYTHON-106
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
@@ -168,7 +168,7 @@ def _update_keyspace(self, keyspace_meta, new_user_types=None):
         self.keyspaces[ks_name] = keyspace_meta
         if old_keyspace_meta:
             keyspace_meta.tables = old_keyspace_meta.tables
-            keyspace_meta.user_types = new_user_types or old_keyspace_meta.user_types
+            keyspace_meta.user_types = new_user_types if new_user_types is not None else old_keyspace_meta.user_types
             keyspace_meta.indexes = old_keyspace_meta.indexes
             keyspace_meta.functions = old_keyspace_meta.functions
             keyspace_meta.aggregates = old_keyspace_meta.aggregates
diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py
@@ -722,32 +722,29 @@ def test_refresh_user_type_metadata_proto_2(self):
 
         @test_category metadata
         """
-        if 1 not in get_supported_protocol_versions() and 2 not in get_supported_protocol_versions():
-                raise unittest.SkipTest("Protocol 1 or 2 is not support in Cassandra version ".format(CASSANDRA_VERSION))
-        cluster2 = None
-        if 2 in get_supported_protocol_versions():
-            cluster2 = Cluster(protocol_version=2)
-            session2 = cluster2.connect()
-        cluster1 = None
-        if 1 in get_supported_protocol_versions():
-            cluster1 = Cluster(protocol_version=1)
-            session1 = cluster1.connect()
-
-        if cluster2:
-            self.assertEqual(cluster2.metadata.keyspaces[self.keyspace_name].user_types, {})
-            session2.execute("CREATE TYPE {0}.user (age int, name text)".format(self.keyspace_name))
-            self.assertIn("user", cluster2.metadata.keyspaces[self.keyspace_name].user_types)
-            session2.execute("DROP TYPE {0}.user".format(self.keyspace_name))
-            self.assertEqual(cluster2.metadata.keyspaces[self.keyspace_name].user_types, {})
-            cluster2.shutdown()
+        supported_versions = get_supported_protocol_versions()
+        if 2 not in supported_versions:  # 1 and 2 were dropped in the same version
+                raise unittest.SkipTest("Protocol versions 1 and 2 are not supported in Cassandra version ".format(CASSANDRA_VERSION))
+
+        for protocol_version in (1, 2):
+            cluster = Cluster(protocol_version=protocol_version)
+            session = cluster.connect()
+            self.assertEqual(cluster.metadata.keyspaces[self.keyspace_name].user_types, {})
+
+            session.execute("CREATE TYPE {0}.user (age int, name text)".format(self.keyspace_name))
+            self.assertIn("user", cluster.metadata.keyspaces[self.keyspace_name].user_types)
+            self.assertIn("age", cluster.metadata.keyspaces[self.keyspace_name].user_types["user"].field_names)
+            self.assertIn("name", cluster.metadata.keyspaces[self.keyspace_name].user_types["user"].field_names)
+
+            session.execute("ALTER TYPE {0}.user ADD flag boolean".format(self.keyspace_name))
+            self.assertIn("flag", cluster.metadata.keyspaces[self.keyspace_name].user_types["user"].field_names)
+
+            session.execute("ALTER TYPE {0}.user RENAME flag TO something".format(self.keyspace_name))
+            self.assertIn("something", cluster.metadata.keyspaces[self.keyspace_name].user_types["user"].field_names)
 
-        if cluster1:
-            self.assertEqual(cluster1.metadata.keyspaces[self.keyspace_name].user_types, {})
-            session1.execute("CREATE TYPE {0}.user (age int, name text)".format(self.keyspace_name))
-            self.assertIn("user", cluster1.metadata.keyspaces[self.keyspace_name].user_types)
-            session1.execute("DROp TYPE {0}.user".format(self.keyspace_name))
-            self.assertEqual(cluster1.metadata.keyspaces[self.keyspace_name].user_types, {})
-            cluster1.shutdown()
+            session.execute("DROP TYPE {0}.user".format(self.keyspace_name))
+            self.assertEqual(cluster.metadata.keyspaces[self.keyspace_name].user_types, {})
+            cluster.shutdown()
 
     def test_refresh_user_function_metadata(self):
         """
