Merge pull request cockroachdb#14668 from vivekmenezes/alloc

acceptance: set distsql for schema validation in allocator tests
andreimatei · Apr 6, 2017 · 6e824ae · 6e824ae
2 parents fe5c546 + 6490b3c
commit 6e824ae
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/acceptance/allocator_test.go b/pkg/acceptance/allocator_test.go
@@ -269,6 +269,12 @@ func (at *allocatorTest) ValidateSchemaChanges(ctx context.Context, t *testing.T
 	if err := db.QueryRow("SELECT cluster_logical_timestamp()").Scan(&now); err != nil {
 		t.Fatal(err)
 	}
+
+	// Set distsql for these queries because it's still not the default.
+	if _, err := db.Exec(`SET DISTSQL = on`); err != nil {
+		t.Fatal(err)
+	}
+
 	var eCount int64
 	q := fmt.Sprintf(`SELECT COUNT(*) FROM %s AS OF SYSTEM TIME %s`, tableName, now)
 	if err := db.QueryRow(q).Scan(&eCount); err != nil {