Merge branch 'master2' into improve_history_localization

# Conflicts:
#	ihatemoney/tests/tests.py

.gitignore

@@ -12,3 +12,4 @@ build
 .env
 .pytest_cache
 ihatemoney/budget.db
+.idea/

ihatemoney/migrations/env.py

@@ -41,7 +41,7 @@ def run_migrations_offline():
 
     """
     url = config.get_main_option("sqlalchemy.url")
-    context.configure(url=url)
+    context.configure(url=url, include_object=include_object)
 
     with context.begin_transaction():
         context.run_migrations()
@@ -75,6 +75,7 @@ def run_migrations_online():
     context.configure(
         connection=connection,
         target_metadata=target_metadata,
+        include_object=include_object,
         process_revision_directives=process_revision_directives,
         **current_app.extensions["migrate"].configure_args
     )
@@ -86,6 +87,12 @@ def run_migrations_online():
         connection.close()
 
 
+def include_object(object, name, type_, reflected, compare_to):
+    if name == "sqlite_sequence":
+        return False
+    return True
+
+
 if context.is_offline_mode():
     run_migrations_offline()
 else:

ihatemoney/migrations/versions/2dcb0c0048dc_autologger.py

@@ -165,21 +165,39 @@ def upgrade():
         sa.Column("remote_addr", sa.String(length=50), nullable=True),
         sa.PrimaryKeyConstraint("id"),
     )
-    op.add_column(
+    bind = op.get_bind()
-        "project",
+    if bind.engine.name == "sqlite":
-        sa.Column(
+        with op.batch_alter_table("project", recreate="always") as batch_op:
-            "logging_preference",
+            batch_op.add_column(
-            sa.Enum("DISABLED", "ENABLED", "RECORD_IP", name="loggingmode"),
+                sa.Column(
-            server_default="ENABLED",
+                    "logging_preference",
-            nullable=False,
+                    sa.Enum("DISABLED", "ENABLED", "RECORD_IP", name="loggingmode"),
-        ),
+                    server_default="ENABLED",
-    )
+                    nullable=False,
+                ),
+            )
+    else:
+        op.add_column(
+            "project",
+            sa.Column(
+                "logging_preference",
+                sa.Enum("DISABLED", "ENABLED", "RECORD_IP", name="loggingmode"),
+                server_default="ENABLED",
+                nullable=False,
+            ),
+        )
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column("project", "logging_preference")
+
+    bind = op.get_bind()
+    if bind.engine.name == "sqlite":
+        with op.batch_alter_table("project", recreate="always") as batch_op:
+            batch_op.drop_column("logging_preference")
+    else:
+        op.drop_column("project", "logging_preference")
     op.drop_table("transaction")
     op.drop_index(
         op.f("ix_project_version_transaction_id"), table_name="project_version"

ihatemoney/models.py

@@ -460,7 +460,7 @@ class Bill(db.Model):
             return 0
 
     def __str__(self):
-        return f"{self.amount} for {self.what}"
+        return self.what
 
     def __repr__(self):
         return (

ihatemoney/tests/tests.py

@@ -2592,7 +2592,7 @@ class HistoryTestCase(IhatemoneyTestCase):
         resp = self.client.get("/demo/history")
         self.assertEqual(resp.status_code, 200)
         self.assertIn(
-            f"Bill {em_surround('25.0 for fromage à raclette')} added",
+            f"Bill {em_surround('fromage à raclette')} added",
             resp.data.decode("utf-8"),
         )
 
@@ -2613,26 +2613,26 @@ class HistoryTestCase(IhatemoneyTestCase):
         resp = self.client.get("/demo/history")
         self.assertEqual(resp.status_code, 200)
         self.assertIn(
-            f"Bill {em_surround('25.0 for fromage à raclette')} added",
+            f"Bill {em_surround('fromage à raclette')} added",
             resp.data.decode("utf-8"),
         )
         self.assertRegex(
             resp.data.decode("utf-8"),
             r"Bill %s:\s* amount changed\s* from %s\s* to %s"
             % (
-                em_surround("25.0 for fromage à raclette", regex_escape=True),
+                em_surround("fromage à raclette", regex_escape=True),
                 em_surround("25.0", regex_escape=True),
                 em_surround("10.0", regex_escape=True),
             ),
         )
         self.assertIn(
             "Bill %s renamed to %s"
-            % (em_surround("25.0 for fromage à raclette"), em_surround("new thing"),),
+            % (em_surround("fromage à raclette"), em_surround("new thing"),),
             resp.data.decode("utf-8"),
         )
         self.assertLess(
             resp.data.decode("utf-8").index(
-                f"Bill {em_surround('25.0 for fromage à raclette')} renamed to"
+                f"Bill {em_surround('fromage à raclette')} renamed to"
             ),
             resp.data.decode("utf-8").index("amount changed"),
         )
@@ -2644,8 +2644,7 @@ class HistoryTestCase(IhatemoneyTestCase):
         resp = self.client.get("/demo/history")
         self.assertEqual(resp.status_code, 200)
         self.assertIn(
-            f"Bill {em_surround('10.0 for new thing')} removed",
+            f"Bill {em_surround('new thing')} removed", resp.data.decode("utf-8"),
-            resp.data.decode("utf-8"),
         )
 
         # edit user
@@ -2740,7 +2739,7 @@ class HistoryTestCase(IhatemoneyTestCase):
         self.assertRegex(
             resp.data.decode("utf-8"),
             r"Bill {}:\s* amount changed\s* from {}\s* to {}".format(
-                em_surround("25.0 for Bill 1", regex_escape=True),
+                em_surround("Bill 1", regex_escape=True),
                 em_surround("25.0", regex_escape=True),
                 em_surround("88.0", regex_escape=True),
             ),
@@ -2783,11 +2782,9 @@ class HistoryTestCase(IhatemoneyTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data.decode("utf-8").count("<td> -- </td>"), 5)
         self.assertNotIn("127.0.0.1", resp.data.decode("utf-8"))
+        self.assertIn(f"Bill {em_surround('Bill 1')} added", resp.data.decode("utf-8"))
         self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} added", resp.data.decode("utf-8")
+            f"Bill {em_surround('Bill 1')} removed", resp.data.decode("utf-8"),
-        )
-        self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} removed", resp.data.decode("utf-8"),
         )
 
         # Add a new bill
@@ -2806,20 +2803,13 @@ class HistoryTestCase(IhatemoneyTestCase):
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data.decode("utf-8").count("<td> -- </td>"), 6)
         self.assertNotIn("127.0.0.1", resp.data.decode("utf-8"))
-        self.assertIn(
+        self.assertIn(f"Bill {em_surround('Bill 1')} added", resp.data.decode("utf-8"))
-            f"Bill {em_surround('25.0 for Bill 1')} added", resp.data.decode("utf-8")
-        )
         self.assertEqual(
-            resp.data.decode("utf-8").count(
+            resp.data.decode("utf-8").count(f"Bill {em_surround('Bill 1')} added"), 1,
-                f"Bill {em_surround('25.0 for Bill 1')} added"
-            ),
-            1,
         )
+        self.assertIn(f"Bill {em_surround('Bill 2')} added", resp.data.decode("utf-8"))
         self.assertIn(
-            f"Bill {em_surround('20.0 for Bill 2')} added", resp.data.decode("utf-8")
+            f"Bill {em_surround('Bill 1')} removed", resp.data.decode("utf-8"),
-        )
-        self.assertIn(
-            f"Bill {em_surround('25.0 for Bill 1')} removed", resp.data.decode("utf-8"),
         )
 
     def test_double_bill_double_person_edit_second_no_web(self):