migrate_boolean_attributes: multiple attributes (pynamodb#538)

vo-va · ikonst · commit d5bd02761b1d · 2019-01-15T00:06:04.000-08:00
Fix legacy boolean migration when multiple attributes are specified.
diff --git a/pynamodb/migration.py b/pynamodb/migration.py
@@ -115,7 +115,7 @@ def migrate_boolean_attributes(model_class,
             if condition is None:
                 condition = Path(attr_name) == (1 if old_value else 0)
             else:
-                condition = condition & Path(attr_name) == (1 if old_value else 0)
+                condition = condition & (Path(attr_name) == (1 if old_value else 0))
 
         if actions:
             assert condition is not None
diff --git a/pynamodb/tests/integration/test_migration.py b/pynamodb/tests/integration/test_migration.py
@@ -44,6 +44,54 @@ class Meta:
     assert 1 == len([_ for _ in BAModel.query('pkey', Path('flag') == True)])
 
 
+@pytest.mark.ddblocal
+def test_migrate_two_or_more_boolean_attributes_upgrade_path(ddb_url):
+    class BAModel(Model):
+        class Meta:
+            table_name = 'migration_test_lba_to_ba_two_or_more_attrs'
+            host = ddb_url
+        id = UnicodeAttribute(hash_key=True)
+        flag = BooleanAttribute(null=True)
+        second_flag = BooleanAttribute(null=True)
+
+    class LBAModel(Model):
+        class Meta:
+            table_name = 'migration_test_lba_to_ba_two_or_more_attrs'
+            host = ddb_url
+        id = UnicodeAttribute(hash_key=True)
+        flag = LegacyBooleanAttribute(null=True)
+        second_flag = LegacyBooleanAttribute(null=True)
+
+    LBAModel.create_table(read_capacity_units=1, write_capacity_units=1)
+
+    # Create one "offending" object written as an integer using LBA.
+    LBAModel('pkey', flag=True, second_flag=True).save()
+    assert 1 == len([_ for _ in LBAModel.query('pkey', LBAModel.flag == True)])
+    assert LBAModel.get('pkey').second_flag  == True
+
+    # We should NOT be able to read it using BA.
+    assert 0 == len([_ for _ in BAModel.query('pkey', BAModel.flag == True)])
+
+    # ... unless we jump through hoops using Path
+    assert 1 == len([_ for _ in BAModel.query('pkey', Path('flag') == 1)])
+
+    # Migrate the object to being stored as Boolean.
+    assert (1, 0) == migrate_boolean_attributes(BAModel, ['flag', 'second_flag'], allow_rate_limited_scan_without_consumed_capacity=True)
+
+    # We should now be able to read it using BA.
+    assert 1 == len([_ for _ in BAModel.query('pkey', BAModel.flag == True)])
+
+    # ... or through the hoop jumping.
+    assert 1 == len([_ for _ in BAModel.query('pkey', Path('flag') == True)])
+
+    # checking that both attributes are changed
+    the_item = BAModel.get('pkey')
+    assert the_item.flag == True
+    assert the_item.second_flag == True
+
+    LBAModel.delete_table()
+
+
 @pytest.mark.ddblocal
 def test_migrate_boolean_attributes_none_okay(ddb_url):
     """Ensure migration works for attributes whose value is None."""
