Cache settings value even when they are retrieved from settings to av…

…oid database hits.

extra_settings/models.py

@@ -60,6 +60,8 @@ def get(cls, name, default=None):
                 # cache all other settings to avoid multiple queries
                 # in pages using the template more than once.
                 cls._cache_all_settings()
+        if val is not None:
+            set_cached_setting(name, val)
         return val
 
     @classmethod

tests/settings.py

@@ -6,7 +6,7 @@
 
 ALLOWED_HOSTS = ["*"]
 
-EXTRA_SETTINGS_TEST_FALLBACK_VALUE = "fallback-value"
+# Package settings
 EXTRA_SETTINGS_DEFAULTS = [
     {
         "name": "TEST_DEFAULT_URL",
@@ -15,6 +15,10 @@
     },
 ]
 
+# Test settings
+EXTRA_SETTINGS_TEST_VALUE = "value"
+EXTRA_SETTINGS_TEST_FALLBACK_VALUE = "fallback-value"
+
 # Application definition
 INSTALLED_APPS = [
     "extra_settings",

tests/test_models.py

@@ -143,6 +143,14 @@ def test_get_num_queries(self):
         with self.assertNumQueries(0):
             Setting.get("TEST_SETTING_STRING")
 
+    def test_get_from_conf_settings_num_queries(self):
+        with self.assertNumQueries(1):
+            setting_value = Setting.get("EXTRA_SETTINGS_TEST_VALUE")
+            self.assertEqual(setting_value, "value")
+        with self.assertNumQueries(0):
+            setting_value = Setting.get("EXTRA_SETTINGS_TEST_VALUE")
+            self.assertEqual(setting_value, "value")
+
     def test_cache_updated_on_model_delete(self):
         setting_obj, setting_created = Setting.objects.get_or_create(
             name="TEST_GETTER_SETTER", defaults={"value_type": Setting.TYPE_STRING}

tests/test_templatetags.py

@@ -1,6 +1,7 @@
 from django.template import Context, Template
 from django.test import TestCase
 
+from extra_settings.cache import del_cached_setting
 from extra_settings.models import Setting
 
 
@@ -49,6 +50,7 @@ def test_get_setting_with_fallback_auto(self):
         self.assertEqual(rendered, "fallback-value")
 
     def test_get_setting_with_fallback(self):
+        del_cached_setting("EXTRA_SETTINGS_TEST_FALLBACK_VALUE")
         with self.settings(EXTRA_SETTINGS_FALLBACK_TO_CONF_SETTINGS=True):
             rendered = self._render_template(
                 "{% load extra_settings %}"
@@ -57,6 +59,7 @@ def test_get_setting_with_fallback(self):
             self.assertEqual(rendered, "fallback-value")
 
     def test_get_setting_without_fallback(self):
+        del_cached_setting("EXTRA_SETTINGS_TEST_FALLBACK_VALUE")
         with self.settings(EXTRA_SETTINGS_FALLBACK_TO_CONF_SETTINGS=False):
             rendered = self._render_template(
                 "{% load extra_settings %}"
@@ -65,6 +68,7 @@ def test_get_setting_without_fallback(self):
             self.assertEqual(rendered, "")
 
     def test_get_setting_without_fallback_default(self):
+        del_cached_setting("EXTRA_SETTINGS_TEST_FALLBACK_VALUE")
         with self.settings(EXTRA_SETTINGS_FALLBACK_TO_CONF_SETTINGS=False):
             rendered = self._render_template(
                 "{% load extra_settings %}"