Merge pull request ckan#8336 from ckan/create-from-models-alembic

ckan db create-from-model: update alembic too

changes/8336.bugfix

@@ -0,0 +1 @@
+`ckan db upgrade` can now be used after `ckan db create-from-model`

ckan/cli/db.py

@@ -50,8 +50,17 @@ def create_from_model():
     """
     try:
         model.repo.create_db()
-    except Exception as e:
-        error_shout(e)
+        model.repo.stamp_alembic_head()
+
+        # also mark plugins as migrated
+        # FIXME: move to model.repo?
+        pending = _get_pending_plugins()
+        for plugin in sorted(pending):
+            with _repo_for_plugin(plugin) as repo:
+                print(plugin, repo)
+                repo.stamp_alembic_head()
+    except Exception:
+        raise
     else:
         click.secho('Create DB from model: SUCCESS', fg='green', bold=True)
 

ckan/model/__init__.py

@@ -14,7 +14,8 @@
 from alembic.command import (
     upgrade as alembic_upgrade,
     downgrade as alembic_downgrade,
-    current as alembic_current
+    current as alembic_current,
+    stamp as alembic_stamp,
 )
 from alembic.config import Config as AlembicConfig
 
@@ -241,8 +242,17 @@ def create_db(self) -> None:
         '''
         with ensure_engine().begin() as conn:
             self.metadata.create_all(conn)
+
         log.info('Database tables created')
 
+    def stamp_alembic_head(self):
+        '''mark database as up to date for alembic'''
+        alembic_config = AlembicConfig(self._alembic_ini)
+        alembic_config.set_main_option(
+            "sqlalchemy.url", config.get("sqlalchemy.url")
+        )
+        alembic_stamp(alembic_config, 'head')
+
     def rebuild_db(self) -> None:
         '''Clean and init the db'''
         if self.tables_created_and_initialised: