Merge pull request #93 from rafiss/enable-django

Enable testing against Django

Author: rafiss

Dockerfile

@@ -1,8 +1,8 @@
-FROM openjdk:8
+FROM openjdk:8-slim-buster
 
 RUN apt-get update -y
 
-RUN apt-get install -y zlib1g zlib1g-dev
+RUN apt-get install -y zlib1g zlib1g-dev curl wget apt-utils
 
 # installations for django
 RUN apt-get install -y python3 python3-dev python3-pip
@@ -17,7 +17,7 @@ RUN apt-get install -y nodejs
 
 # RUN apt-get install -y ruby-full
 
-RUN apt-get install -y postgresql postgresql-contrib libpq-dev git wget build-essential curl openssl
+RUN apt-get install -y postgresql postgresql-contrib libpq-dev git build-essential openssl
 
 # Installations for gradle and gradlew
 RUN apt-get install gradle -y

Makefile

@@ -42,5 +42,4 @@ deps:
 	$(MAKE) deps -C ./python/sqlalchemy
 	$(MAKE) deps -C ./ruby/activerecord
 	$(MAKE) deps -C ./ruby/ar4
-	# Django test is disabled for now.
-	# $(MAKE) deps -C ./python/django
+	$(MAKE) deps -C ./python/django

docker.sh

@@ -21,7 +21,7 @@
 
 set -euo pipefail
 
-image=cockroachdb/example-orms-builder:latest
+image=cockroachdb/example-orms-builder:20200129-1444
 
 gopath=$(go env GOPATH)
 gopath0=${gopath%%:*}

python/django/Makefile

@@ -3,6 +3,7 @@ start:
 	python3 manage.py migrate cockroach_example && python3 manage.py runserver 6543
 
 deps:
-	git clone https://github.com/cockroachlabs/cockroach-django || true
-	cd cockroach-django && pip3 install .
+	git clone https://github.com/cockroachdb/django-cockroachdb || true
+	pip3 install --upgrade setuptools
 	pip3 install django
+	cd django-cockroachdb && pip3 install .

ruby/activerecord/Makefile

@@ -24,5 +24,5 @@ start:
 
 .PHONY: deps
 deps:
-	@gem install bundler
+	@gem install bundler:1.15.1
 	@bin/bundle

testing/main_test.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"os"
 	"os/exec"
+	"strings"
 	"syscall"
 	"testing"
 	"time"
@@ -42,7 +43,7 @@ var customURLSchemes = map[application]string{
 }
 
 // initTestDatabase launches a test database as a subprocess.
-func initTestDatabase(t *testing.T, app application) (*sql.DB, *url.URL, func()) {
+func initTestDatabase(t *testing.T, app application) (*sql.DB, *url.URL, string, func()) {
 	ts, err := testserver.NewTestServer()
 	if err != nil {
 		t.Fatal(err)
@@ -70,10 +71,16 @@ func initTestDatabase(t *testing.T, app application) (*sql.DB, *url.URL, func())
 		t.Fatal(err)
 	}
 
+	var version string
+	if err := db.QueryRow(`SELECT value FROM crdb_internal.node_build_info where field = 'Version'`,
+	).Scan(&version); err != nil {
+		t.Fatal(err)
+	}
+
 	if scheme, ok := customURLSchemes[app]; ok {
 		url.Scheme = scheme
 	}
-	return db, url, func() {
+	return db, url, version, func() {
 		_ = db.Close()
 		ts.Stop()
 	}
@@ -147,9 +154,13 @@ func testORM(
 		orm:      orm,
 	}
 
-	db, dbURL, stopDB := initTestDatabase(t, app)
+	db, dbURL, version, stopDB := initTestDatabase(t, app)
 	defer stopDB()
 
+	if orm == "django"  && (strings.HasPrefix(version, "v2.0") || strings.HasPrefix(version, "v2.1")) {
+		t.Skip("TestDjango fails on CRDB <=v2.1 due to missing foreign key support.")
+	}
+
 	td := testDriver{
 		db:          db,
 		dbName:      app.dbName(),
@@ -250,7 +261,6 @@ func TestSQLAlchemy(t *testing.T) {
 }
 
 func TestDjango(t *testing.T) {
-	t.Skip("TestDjango fails on CRDB v2.1; github.com/cockroachdb/cockroach/issues/42083")
 	testORM(t, "python", "django", djangoTestTableNames, djangoTestColumnNames)
 }