Get sqlproxy tests passing with Django

Author: rafiss

python/django/Makefile

@@ -4,4 +4,4 @@ start:
 
 deps:
 	pip3 install --upgrade setuptools
-	pip3 install django==3.2.8 django-cockroachdb==3.2.1 psycopg2
+	pip3 install django==3.2.8 django-cockroachdb==3.2.1 psycopg2 dj-database-url==0.5.0

python/django/cockroach_example/settings.py

@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/2.2/ref/settings/
 """
 
+import dj_database_url
 import os
 
 from urllib.parse import urlparse
@@ -76,24 +77,21 @@
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 
-port = 26257
+DATABASES = {}
 addr = os.getenv('ADDR')
 if addr is not None:
     url = urlparse(addr)
-    port = url.port
-
-DATABASES = {
-    'default': {
+    DATABASES['default'] = dj_database_url.config(default=addr, engine='django_cockroachdb')
+    DATABASES['default']['DISABLE_COCKROACHDB_TELEMETRY'] = True
+else:
+    DATABASES['default'] = {
         'ENGINE' : 'django_cockroachdb',
         'NAME' : 'company_django',
         'USER' : 'root',
-        'PASSWORD': '',
         'HOST' : 'localhost',
-        'PORT' : port,
+        'PORT' : 26257,
         'DISABLE_COCKROACHDB_TELEMETRY' : True,
     }
-}
-
 
 # Password validation
 # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators

testing/main_test.go

@@ -474,20 +474,14 @@ func TestSQLAlchemy(t *testing.T) {
 }
 
 func TestDjango(t *testing.T) {
-	testORMForAuthModesExcept(t, testInfo{
-		language:    "python",
-		orm:         "django",
-		tableNames:  djangoTestTableNames,
-		columnNames: djangoTestColumnNames,
-	},
-		map[authMode]string{
-			// No support for client certs (at least not via the query string).
-			// psycopg2.OperationalError: fe_sendauth: no password supplied
-			//authClientCert: "client certs via query string unsupported",
-			// Ditto,
-			// psycopg2.OperationalError: fe_sendauth: no password supplied
-			//authPassword: "password via query string unsupported",
-		},
+	testORMForAuthModesExcept(
+		t,
+		testInfo{
+			language:    "python",
+			orm:         "django",
+			tableNames:  djangoTestTableNames,
+			columnNames: djangoTestColumnNames,
+		}, nothingSkipped(),
 	)
 }