Plugin baselines skip tables that already exist

plugins/printers/migrations/versions/0002_printersupplyalerts.py

@@ -4,6 +4,11 @@ Stores the last tier alerted per (printer, supply) so the poller fires once
 on a downward crossing and re-arms after a refill. Idempotent create.
 """
 from alembic import op
+
+from shopdb.plugins.alembic_template import (
+    create_index_if_missing,
+    create_table_if_missing,
+)
 import sqlalchemy as sa
 
 
@@ -19,7 +24,7 @@ def upgrade():
     inspector = sa.inspect(bind)
     if 'printersupplyalerts' in inspector.get_table_names():
         return
-    op.create_table(
+    create_table_if_missing(
         'printersupplyalerts',
         sa.Column('printersupplyalertid', sa.Integer(), primary_key=True),
         sa.Column('printerid', sa.Integer(), nullable=False),
@@ -35,8 +40,8 @@ def upgrade():
         sa.UniqueConstraint('printerid', 'supplykey',
                             name='uq_printersupplyalert_printer_key'),
     )
-    op.create_index('ix_printersupplyalerts_printerid',
-                    'printersupplyalerts', ['printerid'])
+    create_index_if_missing('ix_printersupplyalerts_printerid',
+                            'printersupplyalerts', ['printerid'])
 
 
 def downgrade():

plugins/printers/migrations/versions/0005_observedqueues.py

@@ -21,6 +21,11 @@ Revision ID: printers0005observedqueues
 Revises: printers0004drivervendor
 """
 from alembic import op
+
+from shopdb.plugins.alembic_template import (
+    create_index_if_missing,
+    create_table_if_missing,
+)
 import sqlalchemy as sa
 
 
@@ -36,7 +41,7 @@ def upgrade():
     inspector = sa.inspect(bind)
     if 'printerobservedqueues' in inspector.get_table_names():
         return
-    op.create_table(
+    create_table_if_missing(
         'printerobservedqueues',
         sa.Column('printerobservedqueueid', sa.Integer(), nullable=False),
         # Nullable and no index of its own beyond the explicit one below: an
@@ -67,10 +72,10 @@ def upgrade():
     )
     # Port address is the primary match key from an observed queue back to a
     # printer asset, so every comparison read hits it.
-    op.create_index('idx_printerobservedqueues_portaddress',
-                    'printerobservedqueues', ['portaddress'])
-    op.create_index('idx_printerobservedqueues_assetid',
-                    'printerobservedqueues', ['assetid'])
+    create_index_if_missing('idx_printerobservedqueues_portaddress',
+                            'printerobservedqueues', ['portaddress'])
+    create_index_if_missing('idx_printerobservedqueues_assetid',
+                            'printerobservedqueues', ['assetid'])
 
 
 def downgrade():