From 0f57969cf6a2d7c79c4907dc954e2976ef5d06a8 Mon Sep 17 00:00:00 2001 From: Shea Craig Date: Thu, 1 Mar 2018 15:54:45 -0500 Subject: [PATCH] Remove duplicate `is_postgres` function from `inventory.views`. --- inventory/views.py | 14 ++++---------- server/utils.py | 7 +++---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/inventory/views.py b/inventory/views.py index 9b1b0f04..ac55b027 100644 --- a/inventory/views.py +++ b/inventory/views.py @@ -389,7 +389,7 @@ def _get_filtered_queryset(self): def _get_unique_items(self, details): """Use optimized DB methods for getting unique items if possible.""" - if is_postgres(): + if utils.is_postgres(): versions = details.order_by("version").distinct( "version").values_list("version", flat=True) paths = details.order_by("path").distinct("path").values_list( @@ -459,7 +459,7 @@ def get(self, request, *args, **kwargs): if group_type != "all": self.components.append(group_id) - if is_postgres(): + if utils.is_postgres(): apps = [self.get_application_entry(item, queryset) for item in queryset.select_related("application").order_by( ).distinct("application")] @@ -565,14 +565,14 @@ def inventory_submit(request): path=item.get('path', ''), machine=machine ) - if is_postgres(): + if utils.is_postgres(): inventory_items_to_be_created.append(i_item) else: i_item.save() machine.last_inventory_update = timezone.now() inventory_meta.save() - if is_postgres(): + if utils.is_postgres(): InventoryItem.objects.bulk_create( inventory_items_to_be_created) machine.save() @@ -598,9 +598,3 @@ def inventory_hash(request, serial): else: return HttpResponse("MACHINE NOT FOUND") return HttpResponse(sha256hash) - - -def is_postgres(): - postgres_backend = 'django.db.backends.postgresql_psycopg2' - db_setting = settings.DATABASES['default']['ENGINE'] - return db_setting == postgres_backend diff --git a/server/utils.py b/server/utils.py index b35716a8..0baf19b0 100644 --- a/server/utils.py +++ b/server/utils.py @@ -202,10 +202,9 @@ def listify_condition_data(data): def is_postgres(): - if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.postgresql_psycopg2': - return True - else: - return False + postgres_backend = 'django.db.backends.postgresql_psycopg2' + db_setting = settings.DATABASES['default']['ENGINE'] + return db_setting == postgres_backend def flatten_and_sort_list(the_list):