kallithea Changeset - 555c8d26988f

Changeset - 555c8d26988f

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Søren Løvborg - 9 years ago 2016-09-13 18:40:49
sorenl@unity3d.com

db: always add to session in Setting.create_or_update

There's no use case for not adding the newly created Setting to the
SQLAlchemy session (and thus, once we commit, the database).

With this change, all the various "create" model methods add their
result to the session.

6 files changed with 12 insertions and 30 deletions:

kallithea/controllers/admin/auth_settings.py

kallithea/controllers/admin/defaults.py

kallithea/controllers/admin/settings.py

kallithea/model/db.py

kallithea/tests/conftest.py

kallithea/tests/models/test_settings.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/auth_settings.py

➞

Show inline comments

@@ @@ -128,13 +128,12 @@ class AuthSettingsController(BaseControl @@
             for k, v in form_result.items():
                 if k == 'auth_plugins':
                     # we want to store it comma separated inside our settings
                     v = ','.join(v)
                 log.debug("%s = %s", k, str(v))
                 setting = Setting.create_or_update(k, v)
                 Session().add(setting)
             Session().commit()
             h.flash(_('Auth settings updated successfully'),
                        category='success')
         except formencode.Invalid as errors:
             log.error(traceback.format_exc())
             e = errors.error_dict or {}

kallithea/controllers/admin/defaults.py

➞

Show inline comments

@@ @@ -68,13 +68,12 @@ class DefaultsController(BaseController) @@
         _form = DefaultsForm()()
         try:
             form_result = _form.to_python(dict(request.POST))
             for k, v in form_result.iteritems():
                 setting = Setting.create_or_update(k, v)
                 Session().add(setting)
             Session().commit()
             h.flash(_('Default settings updated successfully'),
                     category='success')
         except formencode.Invalid as errors:
             defaults = errors.value

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -205,31 +205,20 @@ class SettingsController(BaseController) @@
                     errors=errors.error_dict or {},
                     prefix_error=False,
                     encoding="UTF-8",
                     force_defaults=False)
             try:
                 sett1 = Setting.create_or_update('title',
                                             form_result['title'])
                 Session().add(sett1)
                 sett2 = Setting.create_or_update('realm',
                                             form_result['realm'])
                 Session().add(sett2)
                 sett3 = Setting.create_or_update('ga_code',
                                             form_result['ga_code'])
                 Session().add(sett3)
                 sett4 = Setting.create_or_update('captcha_public_key',
                                     form_result['captcha_public_key'])
                 Session().add(sett4)
                 sett5 = Setting.create_or_update('captcha_private_key',
                                     form_result['captcha_private_key'])
                 Session().add(sett5)
                 for setting in (
                     'title',
                     'realm',
                     'ga_code',
                     'captcha_public_key',
                     'captcha_private_key',
                 ):
                     Setting.create_or_update(setting, form_result[setting])
                 Session().commit()
                 set_app_settings(config)
                 h.flash(_('Updated application settings'), category='success')
             except Exception:
@@ @@ -276,15 +265,13 @@ class SettingsController(BaseController) @@
                     ('show_version', 'show_version', 'bool'),
                     ('use_gravatar', 'use_gravatar', 'bool'),
                     ('gravatar_url', 'gravatar_url', 'unicode'),
                     ('clone_uri_tmpl', 'clone_uri_tmpl', 'unicode'),
+                ]
                 for setting, form_key, type_ in settings:
                     sett = Setting.create_or_update(setting,
                                         form_result[form_key], type_)
                     Session().add(sett)
                     Setting.create_or_update(setting, form_result[form_key], type_)
                 Session().commit()
                 set_app_settings(config)
                 h.flash(_('Updated visualisation settings'),
                         category='success')

kallithea/model/db.py

➞

Show inline comments

@@ @@ -268,12 +268,13 @@ class Setting(Base, BaseModel): @@
         """
         res = cls.get_by_name(key)
         if res is None:
             val = Optional.extract(val)
             type = Optional.extract(type)
             res = cls(key, val, type)
             Session().add(res)
         else:
             res.app_settings_name = key
             if not isinstance(val, Optional):
                 # update if set
                 res.app_settings_value = val
             if not isinstance(type, Optional):

kallithea/tests/conftest.py

➞

Show inline comments

@@ @@ -57,14 +57,13 @@ def _set_settings(*kvtseq): @@
     session = Session()
     for kvt in kvtseq:
         assert len(kvt) in (2, 3)
         k = kvt[0]
         v = kvt[1]
         t = kvt[2] if len(kvt) == 3 else 'unicode'
         setting = Setting.create_or_update(k, v, t)
         session.add(setting)
         Setting.create_or_update(k, v, t)
     session.commit()
 @pytest.yield_fixture
 def set_test_settings():
     """Restore settings after test is over."""
@@ @@ -79,14 +78,13 @@ def set_test_settings(): @@
     for s in Setting.query().all():
         if s.app_settings_name not in keys:
             session.delete(s)
     for k, v, t in settings_snapshot:
         if t == 'list' and hasattr(v, '__iter__'):
             v = ','.join(v) # Quirk: must format list value manually.
         s = Setting.create_or_update(k, v, t)
         session.add(s)
         Setting.create_or_update(k, v, t)
     session.commit()
 @pytest.yield_fixture
 def auto_clear_ip_permissions():
     """Fixture that provides nothing but clearing IP permissions upon test
     exit. This clearing is needed to avoid other test failing to make fake http

kallithea/tests/models/test_settings.py

➞

Show inline comments

@@ @@ -4,13 +4,12 @@ from kallithea.model.db import Setting @@
 name = 'spam-setting-name'
 def test_passing_list_setting_value_results_in_string_valued_setting():
     assert Setting.get_by_name(name) is None
     setting = Setting.create_or_update(name, ['spam', 'eggs'])
     Session().add(setting)
     Session().flush()
     try:
         assert Setting.get_by_name(name) is not None
         # Quirk: list value is stringified.
         assert Setting.get_by_name(name).app_settings_value \
                == "['spam', 'eggs']"
@@ @@ -20,13 +19,12 @@ def test_passing_list_setting_value_resu @@
         Session().flush()
 def test_list_valued_setting_creation_requires_manual_value_formatting():
     assert Setting.get_by_name(name) is None
     # Quirk: need manual formatting of list setting value.
     setting = Setting.create_or_update(name, 'spam,eggs', type='list')
     Session().add(setting)
     Session().flush()
     try:
         assert setting.app_settings_value == ['spam', 'eggs']
     finally:
         Session().delete(setting)
         Session().flush()

0 comments (0 inline, 0 general)