From 123c4d59d921c8548a60fcb7f4996cd3c53828ba Mon Sep 17 00:00:00 2001 From: iotmani Date: Wed, 3 Oct 2018 12:33:15 -0400 Subject: [PATCH 1/4] Fix for error when missing MySQLdb --- appengine/standard_python37/django/mysite/settings.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/appengine/standard_python37/django/mysite/settings.py b/appengine/standard_python37/django/mysite/settings.py index 059d3a484f1..77cb00a1efd 100644 --- a/appengine/standard_python37/django/mysite/settings.py +++ b/appengine/standard_python37/django/mysite/settings.py @@ -79,6 +79,16 @@ # Database # https://docs.djangoproject.com/en/2.1/ref/settings/#databases +# Check to see if MySQLdb is available; if not, have pymysql masquerade as +# MySQLdb. This is a convenience feature for developers who cannot install +# MySQLdb locally; when running in production on Google App Engine Standard +# Environment, MySQLdb will be used. +try: + import MySQLdb # noqa: F401 +except ImportError: + import pymysql + pymysql.install_as_MySQLdb() + # [START db_setup] if os.getenv('GAE_APPLICATION', None): # Running on production App Engine, so connect to Google Cloud SQL using From 6fd7eb18b00f413496a261475a9c05d34c3e64e6 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Wed, 10 Oct 2018 17:31:10 -0700 Subject: [PATCH 2/4] Update settings.py --- .../standard_python37/django/mysite/settings.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/appengine/standard_python37/django/mysite/settings.py b/appengine/standard_python37/django/mysite/settings.py index 77cb00a1efd..3832a7c2a7b 100644 --- a/appengine/standard_python37/django/mysite/settings.py +++ b/appengine/standard_python37/django/mysite/settings.py @@ -79,15 +79,11 @@ # Database # https://docs.djangoproject.com/en/2.1/ref/settings/#databases -# Check to see if MySQLdb is available; if not, have pymysql masquerade as -# MySQLdb. This is a convenience feature for developers who cannot install -# MySQLdb locally; when running in production on Google App Engine Standard -# Environment, MySQLdb will be used. -try: - import MySQLdb # noqa: F401 -except ImportError: - import pymysql - pymysql.install_as_MySQLdb() +# Install PyMySQL as mysqlclient/MySQLdb to use Django's mysqlclient adapter +# See https://docs.djangoproject.com/en/2.1/ref/databases/#mysql-db-api-drivers for +# more information +import pymysql +pymysql.install_as_MySQLdb() # [START db_setup] if os.getenv('GAE_APPLICATION', None): From d539ab6b973c5a069e7aef740becafa4cb96330a Mon Sep 17 00:00:00 2001 From: chenyumic Date: Wed, 10 Oct 2018 17:37:50 -0700 Subject: [PATCH 3/4] Update settings.py --- appengine/standard_python37/django/mysite/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/appengine/standard_python37/django/mysite/settings.py b/appengine/standard_python37/django/mysite/settings.py index 3832a7c2a7b..07826748e5f 100644 --- a/appengine/standard_python37/django/mysite/settings.py +++ b/appengine/standard_python37/django/mysite/settings.py @@ -95,6 +95,7 @@ 'HOST': '/cloudsql/[YOUR-CONNECTION-NAME]', 'USER': '[YOUR-USERNAME]', 'PASSWORD': '[YOUR-PASSWORD]', + 'NAME': 'polls', } } else: From 16edbc2a31348f887928c9320be07c76f4fbd6c2 Mon Sep 17 00:00:00 2001 From: chenyumic Date: Wed, 10 Oct 2018 17:38:05 -0700 Subject: [PATCH 4/4] Update settings.py --- appengine/standard_python37/django/mysite/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appengine/standard_python37/django/mysite/settings.py b/appengine/standard_python37/django/mysite/settings.py index 07826748e5f..4eaee248cbd 100644 --- a/appengine/standard_python37/django/mysite/settings.py +++ b/appengine/standard_python37/django/mysite/settings.py @@ -95,7 +95,7 @@ 'HOST': '/cloudsql/[YOUR-CONNECTION-NAME]', 'USER': '[YOUR-USERNAME]', 'PASSWORD': '[YOUR-PASSWORD]', - 'NAME': 'polls', + 'NAME': '[YOUR-DATABASE]', } } else: