Merge pull request #143 from rafiss/skip-tenant-21.1

Skip multi-tenant tests for 21.1

Author: rafiss

go.mod

@@ -3,7 +3,7 @@ module github.com/cockroachdb/examples-orms
 go 1.13
 
 require (
-	github.com/cockroachdb/cockroach-go/v2 v2.2.3
+	github.com/cockroachdb/cockroach-go/v2 v2.2.4
 	github.com/go-pg/pg/v10 v10.9.0
 	github.com/julienschmidt/httprouter v1.1.0
 	github.com/lib/pq v1.10.0

go.sum

@@ -4,8 +4,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/cockroach-go/v2 v2.2.3 h1:2881elKwTMrAWuSP2N/4PtU6XyqoyI55Fv3TSTD+Efo=
-github.com/cockroachdb/cockroach-go/v2 v2.2.3/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI=
+github.com/cockroachdb/cockroach-go/v2 v2.2.4 h1:VuiBJKut2Imgrzl+TNk+U5+GxLOh3hnIFxU0EzjTCnI=
+github.com/cockroachdb/cockroach-go/v2 v2.2.4/go.mod h1:u3MiKYGupPPjkn3ozknpMUpxPaNLTFWAya419/zv6eI=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=

testing/main_test.go

@@ -269,31 +269,9 @@ func testORM(t *testing.T, info testInfo, auth authMode) {
 			},
 		}
 
-		// This cockroach version supports creating tenants, add a test case to
-		// run a tenant server. We need at least 20.1-18 for everything to work out
-		// as the certificate story was reworked immediately before that version
-		// was minted.
-		var tenantsSupported bool
-		if err := db.QueryRow(`
-SELECT
-    (major = 20 AND minor = 1 AND (unstable IS NOT NULL AND unstable > 17))
-	OR (major = 20 AND minor > 1)
-	OR (major > 20)
-FROM
-	[
-		SELECT
-			regexp_extract(v, e'^(\\d+)\\.')::INT8 AS major,
-			regexp_extract(v, e'^\\d+\\.(\\d+)')::INT8
-				AS minor,
-			regexp_extract(v, e'^\\d+\\.\\d+-(\\d+)')::INT8
-				AS unstable
-		FROM
-			[SHOW CLUSTER SETTING version] AS t (v)
-	];
-`,
-		).Scan(&tenantsSupported); err != nil {
-			t.Fatalf("unable to read cluster version: %s", err)
-		}
+		// If the cockroach version supports creating tenants, add a test case to
+		// run a tenant server. We need at least v21.2 for everything to work.
+		tenantsSupported := crdbVersion.AtLeast(version.MustParse("v21.2.0-alpha"))
 		if tenantsSupported {
 			// Connect to the tenant through the SQL proxy, which is only supported
 			// when using secure+password auth. (The proxy does not support client