kallithea Changeset - e1f233b069b0

Changeset - e1f233b069b0

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich (mads) - 6 years ago 2020-06-19 17:24:36
mads@kiilerich.com

db: refactor to clarify that we always invoke SA create_all with checkfirst=False

create_all(checkfirst=True) would skip creating tables that already exist,
potentially leaving them with wrong schema.

We are strict and want a successful create_all to leave all the tables in a
fully known state. We thus want it to fail if any tables already are present.
Existing tables should not silently be accepted.

3 files changed with 4 insertions and 5 deletions:

kallithea/bin/kallithea_cli_db.py

kallithea/lib/db_manage.py

kallithea/tests/fixture.py

0 comments (0 inline, 0 general)

kallithea/bin/kallithea_cli_db.py

➞

Show inline comments

@@ @@ -54,13 +54,13 @@ def db_create(user, password, email, rep @@
             repos_location=repos,
             force_ask=force_ask,
             public_access=public_access,
+    )
     dbmanage = DbManage(dbconf=dbconf, root=kallithea.CONFIG['here'],
                         tests=False, cli_args=cli_args)
-    dbmanage.create_tables(override=True)
     dbmanage.create_tables()
     repo_root_path = dbmanage.prompt_repo_root_path(None)
     dbmanage.create_settings(repo_root_path)
     dbmanage.create_default_user()
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -69,13 +69,13 @@ class DbManage(object): @@
         else:
             # init new sessions
             engine = create_engine(self.dburi)
             init_model(engine)
             self.sa = Session()
-    def create_tables(self, override=False):
     def create_tables(self):
         """
         Create a auth database
         """
         log.info("Any existing database is going to be destroyed")
         if self.tests:
@@ @@ -107,14 +107,13 @@ class DbManage(object): @@
                     conn.execute('DROP DATABASE IF EXISTS "%s"' % database)
                     conn.execute('CREATE DATABASE "%s"' % database)
             else:
                 # known to work on SQLite - possibly not on other databases with strong referential integrity
                 Base.metadata.drop_all()
         checkfirst = not override
         Base.metadata.create_all(checkfirst=checkfirst)
         Base.metadata.create_all(checkfirst=False)
         # Create an Alembic configuration and generate the version table,
         # "stamping" it with the most recent Alembic migration revision, to
         # tell Alembic that all the schema upgrades are already in effect.
         alembic_cfg = alembic.config.Config()
         alembic_cfg.set_main_option('script_location', 'kallithea:alembic')

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -363,13 +363,13 @@ def create_test_env(repos_test_path, con @@
     if not os.path.isdir(repos_test_path):
         log.debug('Creating testdir %s', repos_test_path)
         os.makedirs(repos_test_path)
     dbmanage = DbManage(dbconf=dbconf, root=config['here'],
                         tests=True)
-    dbmanage.create_tables(override=True)
     dbmanage.create_tables()
     # for tests dynamically set new root paths based on generated content
     dbmanage.create_settings(dbmanage.prompt_repo_root_path(repos_test_path))
     dbmanage.create_default_user()
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()

0 comments (0 inline, 0 general)