Drop schema on models change

src/demo_quipuswap/handlers/on_fa12_divest_liquidity.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+
 import demo_quipuswap.models as models
 from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer
 from demo_quipuswap.types.quipu_fa12.parameter.divest_liquidity import DivestLiquidity
@@ -22,4 +23,4 @@ async def on_fa12_divest_liquidity(
     transaction = next(op for op in ctx.operations if op.amount)
     position.tez_qty -= Decimal(transaction.amount) / (10 ** 6)  # type: ignore
     position.token_qty -= Decimal(transfer.parameter.value) / (10 ** decimals)
-    await position.save()
+    await position.save()

src/demo_quipuswap/handlers/on_fa12_invest_liquidity.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+
 import demo_quipuswap.models as models
 from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer
 from demo_quipuswap.types.quipu_fa12.parameter.invest_liquidity import InvestLiquidity
@@ -21,4 +22,4 @@ async def on_fa12_invest_liquidity(
 
     position.tez_qty += Decimal(invest_liquidity.data.amount) / (10 ** 6)  # type: ignore
     position.token_qty += Decimal(transfer.parameter.value) / (10 ** decimals)
-    await position.save()
+    await position.save()

src/demo_quipuswap/handlers/on_fa20_divest_liquidity.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+
 import demo_quipuswap.models as models
 from demo_quipuswap.types.fa2_token.parameter.transfer import Transfer
 from demo_quipuswap.types.quipu_fa2.parameter.divest_liquidity import DivestLiquidity
@@ -22,4 +23,4 @@ async def on_fa20_divest_liquidity(
     transaction = next(op for op in ctx.operations if op.amount)
     position.tez_qty -= Decimal(transaction.amount) / (10 ** 6)  # type: ignore
     position.token_qty -= Decimal(transfer.parameter.__root__[0].txs[0].amount) / (10 ** decimals)
-    await position.save()
+    await position.save()

src/demo_quipuswap/handlers/on_fa20_invest_liquidity.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+
 import demo_quipuswap.models as models
 from demo_quipuswap.types.fa2_token.parameter.transfer import Transfer
 from demo_quipuswap.types.quipu_fa2.parameter.invest_liquidity import InvestLiquidity
@@ -21,4 +22,4 @@ async def on_fa20_invest_liquidity(
 
     position.tez_qty += Decimal(invest_liquidity.data.amount) / (10 ** 6)  # type: ignore
     position.token_qty += Decimal(transfer.parameter.__root__[0].txs[0].amount) / (10 ** decimals)
-    await position.save()
+    await position.save()

src/dipdup/cli.py

@@ -79,25 +79,25 @@ async def run(ctx) -> None:
             },
         )
 
-        for connection_name, connection in Tortoise._connections.items():
-            schema_sql = get_schema_sql(connection, False)
-            schema_hash = hashlib.sha256(schema_sql.encode()).hexdigest()
-
-            try:
-                schema_state = await State.get_or_none(index_type=IndexType.schema, index_name=connection_name)
-            except OperationalError:
-                schema_state = None
-
-            if schema_state is None:
-                await Tortoise.generate_schemas()
-                schema_state = State(index_type=IndexType.schema, index_name=connection_name, hash=schema_hash)
-                await schema_state.save()
-            elif schema_state.hash != schema_hash:
-                pass
-                # FIXME: Hash mismatch every time
-                # _logger.warning('Schema hash mismatch, consider reindexing')
-                # await Tortoise._drop_databases()
-                # os.execl(sys.executable, sys.executable, *sys.argv)
+        connection_name, connection = next(iter(Tortoise._connections.items()))
+        schema_sql = get_schema_sql(connection, False)
+        # NOTE: Column order could differ in two generated schemas for the same models, drop commas and sort strings to eliminate this
+        processed_schema_sql = '\n'.join(sorted(schema_sql.replace(',', '').split('\n'))).encode()
+        schema_hash = hashlib.sha256(processed_schema_sql).hexdigest()
+
+        try:
+            schema_state = await State.get_or_none(index_type=IndexType.schema, index_name=connection_name)
+        except OperationalError:
+            schema_state = None
+
+        if schema_state is None:
+            await Tortoise.generate_schemas()
+            schema_state = State(index_type=IndexType.schema, index_name=connection_name, hash=schema_hash)
+            await schema_state.save()
+        elif schema_state.hash != schema_hash:
+            _logger.warning('Schema hash mismatch, reindexing')
+            await Tortoise._drop_databases()
+            os.execl(sys.executable, sys.executable, *sys.argv)
 
         await config.initialize()