From 9a7dd5ea1977ce19e6566e655b31e2d2285db4b0 Mon Sep 17 00:00:00 2001 From: Karl Date: Mon, 13 Nov 2017 20:11:41 +0000 Subject: [PATCH] Update 0008_reports.py (#1702) * Update 0008_reports.py PG10 version string appears to, at least on Windows, contain a comma. * Fix missing re import. Fix missing re import. * Update 0008_reports.py --- netbox/extras/migrations/0008_reports.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/extras/migrations/0008_reports.py b/netbox/extras/migrations/0008_reports.py index 83565cce7..7f3eccc32 100644 --- a/netbox/extras/migrations/0008_reports.py +++ b/netbox/extras/migrations/0008_reports.py @@ -2,6 +2,7 @@ # Generated by Django 1.11.4 on 2017-09-26 21:25 from __future__ import unicode_literals from distutils.version import StrictVersion +import re from django.conf import settings import django.contrib.postgres.fields.jsonb @@ -18,7 +19,7 @@ def verify_postgresql_version(apps, schema_editor): with connection.cursor() as cursor: cursor.execute("SELECT VERSION()") row = cursor.fetchone() - pg_version = row[0].split()[1] + pg_version = re.match('^PostgreSQL (\d+\.\d+(\.\d+)?)', row[0]).group(1) if StrictVersion(pg_version) < StrictVersion('9.4.0'): raise Exception("PostgreSQL 9.4.0 or higher is required ({} found). Upgrade PostgreSQL and then run migrations again.".format(pg_version))