From f89fd9c3a255752b197c83b62e90faca77de8082 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 18 May 2015 22:28:51 +0200 Subject: [PATCH] Use the MySQL connector that is recommended by Django --- deployment/docker/standalone/Dockerfile | 2 +- src/pretix/settings.py | 5 +---- src/requirements/mysql.txt | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/deployment/docker/standalone/Dockerfile b/deployment/docker/standalone/Dockerfile index f79b1e4b9..920de7014 100644 --- a/deployment/docker/standalone/Dockerfile +++ b/deployment/docker/standalone/Dockerfile @@ -3,7 +3,7 @@ FROM debian:jessie RUN apt-get update && apt-get install -y supervisor python3 git python3-pip \ libxml2-dev libxslt1-dev python-dev python-virtualenv locales libffi-dev \ build-essential python3-dev zlib1g-dev libssl-dev npm gettext git \ - libpq-dev \ + libpq-dev libmysqlclient-dev \ --no-install-recommends WORKDIR / diff --git a/src/pretix/settings.py b/src/pretix/settings.py index fadbc4ed1..0c1d68507 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -25,12 +25,9 @@ else: DEBUG = TEMPLATE_DEBUG = config.getboolean('django', 'debug', fallback=False) -dbengine = 'django.db.backends.' + config.get('database', 'backend', fallback='sqlite3') -if dbengine == 'django.db.backends.mysql': - dbengine = 'mysql.connector.django' DATABASES = { 'default': { - 'ENGINE': dbengine, + 'ENGINE': 'django.db.backends.' + config.get('database', 'backend', fallback='sqlite3'), 'NAME': config.get('database', 'name', fallback=os.path.join(BASE_DIR, 'db.sqlite3')), 'USER': config.get('database', 'user', fallback=''), 'PASSWORD': config.get('database', 'user', fallback=''), diff --git a/src/requirements/mysql.txt b/src/requirements/mysql.txt index 0095ffd8d..93c8d852b 100644 --- a/src/requirements/mysql.txt +++ b/src/requirements/mysql.txt @@ -1,2 +1,2 @@ ---allow-external mysql-connector-python -mysql-connector-python +mysqlclient +