From 1b7081282b23c4001fb508132a8bd3ddeddb58f1 Mon Sep 17 00:00:00 2001 From: Chris Bannister Date: Sun, 18 Oct 2015 18:08:14 +0100 Subject: [PATCH] use control connection to create tables in tests --- cass1batch_test.go | 2 +- cassandra_test.go | 93 ++++++++++++++++++++++------------------------ control.go | 9 ++--- errors_test.go | 8 ++-- session.go | 8 +++- tuple_test.go | 2 +- udt_test.go | 20 +++++----- wiki_test.go | 4 +- 8 files changed, 71 insertions(+), 75 deletions(-) diff --git a/cass1batch_test.go b/cass1batch_test.go index 4b733c202..e33b0c580 100644 --- a/cass1batch_test.go +++ b/cass1batch_test.go @@ -9,7 +9,7 @@ import ( func TestProto1BatchInsert(t *testing.T) { session := createSession(t) - if err := createTable(session, "CREATE TABLE large (id int primary key)"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.large (id int primary key)"); err != nil { t.Fatal(err) } defer session.Close() diff --git a/cassandra_test.go b/cassandra_test.go index c4fbf764d..f9569c9ce 100644 --- a/cassandra_test.go +++ b/cassandra_test.go @@ -57,13 +57,7 @@ func addSslOptions(cluster *ClusterConfig) *ClusterConfig { var initOnce sync.Once func createTable(s *Session, table string) error { - q := s.Query(table) - c := s.pool.Pick(nil) - if c == nil { - return ErrNoConnections - } - - if err := c.executeQuery(q).Close(); err != nil { + if err := s.control.query(table).Close(); err != nil { return err } @@ -101,7 +95,7 @@ func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) { tb.Fatal("createSession:", err) } - err = session.Query(`DROP KEYSPACE IF EXISTS ` + keyspace).Exec() + err = session.control.query(`DROP KEYSPACE IF EXISTS ` + keyspace).Close() if err != nil { tb.Fatal(err) } @@ -110,11 +104,11 @@ func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) { tb.Fatal(err) } - err = session.Query(fmt.Sprintf(`CREATE KEYSPACE %s + err = session.control.query(fmt.Sprintf(`CREATE KEYSPACE %s WITH replication = { 'class' : 'SimpleStrategy', 'replication_factor' : %d - }`, keyspace, *flagRF)).Exec() + }`, keyspace, *flagRF)).Close() if err != nil { tb.Fatal(err) @@ -246,7 +240,7 @@ func TestTracing(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE trace (id int primary key)`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.trace (id int primary key)`); err != nil { t.Fatal("create:", err) } @@ -278,7 +272,7 @@ func TestPaging(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE paging (id int primary key)"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.paging (id int primary key)"); err != nil { t.Fatal("create table:", err) } for i := 0; i < 100; i++ { @@ -310,7 +304,7 @@ func TestCAS(t *testing.T) { defer session.Close() session.cfg.SerialConsistency = LocalSerial - if err := createTable(session, `CREATE TABLE cas_table ( + if err := createTable(session, `CREATE TABLE gocql_test.cas_table ( title varchar, revid timeuuid, last_modified timestamp, @@ -430,7 +424,7 @@ func TestMapScanCAS(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE cas_table2 ( + if err := createTable(session, `CREATE TABLE gocql_test.cas_table2 ( title varchar, revid timeuuid, last_modified timestamp, @@ -472,7 +466,7 @@ func TestBatch(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE batch_table (id int primary key)`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.batch_table (id int primary key)`); err != nil { t.Fatal("create table:", err) } @@ -480,6 +474,7 @@ func TestBatch(t *testing.T) { for i := 0; i < 100; i++ { batch.Query(`INSERT INTO batch_table (id) VALUES (?)`, i) } + if err := session.ExecuteBatch(batch); err != nil { t.Fatal("execute batch:", err) } @@ -500,7 +495,7 @@ func TestUnpreparedBatch(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE batch_unprepared (id int primary key, c counter)`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.batch_unprepared (id int primary key, c counter)`); err != nil { t.Fatal("create table:", err) } @@ -542,7 +537,7 @@ func TestBatchLimit(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE batch_table2 (id int primary key)`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.batch_table2 (id int primary key)`); err != nil { t.Fatal("create table:", err) } @@ -560,7 +555,7 @@ func TestWhereIn(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE where_in_table (id int, cluster int, primary key (id,cluster))`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.where_in_table (id int, cluster int, primary key (id,cluster))`); err != nil { t.Fatal("create table:", err) } @@ -589,7 +584,7 @@ func TestTooManyQueryArgs(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE too_many_query_args (id int primary key, value int)`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.too_many_query_args (id int primary key, value int)`); err != nil { t.Fatal("create table:", err) } @@ -626,7 +621,7 @@ func TestNotEnoughQueryArgs(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE not_enough_query_args (id int, cluster int, value int, primary key (id, cluster))`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.not_enough_query_args (id int, cluster int, value int, primary key (id, cluster))`); err != nil { t.Fatal("create table:", err) } @@ -692,7 +687,7 @@ func (n *FullName) UnmarshalCQL(info TypeInfo, data []byte) error { func TestMapScanWithRefMap(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE scan_map_ref_table ( + if err := createTable(session, `CREATE TABLE gocql_test.scan_map_ref_table ( testtext text PRIMARY KEY, testfullname text, testint int, @@ -736,7 +731,7 @@ func TestMapScanWithRefMap(t *testing.T) { func TestSliceMap(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE slice_map_table ( + if err := createTable(session, `CREATE TABLE gocql_test.slice_map_table ( testuuid timeuuid PRIMARY KEY, testtimestamp timestamp, testvarchar varchar, @@ -860,7 +855,7 @@ func TestScanWithNilArguments(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE scan_with_nil_arguments ( + if err := createTable(session, `CREATE TABLE gocql_test.scan_with_nil_arguments ( foo varchar, bar int, PRIMARY KEY (foo, bar) @@ -896,7 +891,7 @@ func TestScanCASWithNilArguments(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE scan_cas_with_nil_arguments ( + if err := createTable(session, `CREATE TABLE gocql_test.scan_cas_with_nil_arguments ( foo varchar, bar varchar, PRIMARY KEY (foo, bar) @@ -940,7 +935,7 @@ func TestRebindQueryInfo(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE rebind_query (id int, value text, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.rebind_query (id int, value text, PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -980,7 +975,7 @@ func TestStaticQueryInfo(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE static_query_info (id int, value text, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.static_query_info (id int, value text, PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1049,7 +1044,7 @@ func TestBoundQueryInfo(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE clustered_query_info (id int, cluster int, value text, PRIMARY KEY (id, cluster))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.clustered_query_info (id int, cluster int, value text, PRIMARY KEY (id, cluster))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1092,7 +1087,7 @@ func TestBatchQueryInfo(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE batch_query_info (id int, cluster int, value text, PRIMARY KEY (id, cluster))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.batch_query_info (id int, cluster int, value text, PRIMARY KEY (id, cluster))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1137,7 +1132,7 @@ func TestBatchQueryInfo(t *testing.T) { } func injectInvalidPreparedStatement(t *testing.T, session *Session, table string) (string, *Conn) { - if err := createTable(session, `CREATE TABLE `+table+` ( + if err := createTable(session, `CREATE TABLE gocql_test.`+table+` ( foo varchar, bar int, PRIMARY KEY (foo, bar) @@ -1179,7 +1174,7 @@ func TestMissingSchemaPrepare(t *testing.T) { t.Fatal("expected error, but got nil.") } - if err := createTable(s, "CREATE TABLE invalidschemaprep (val int, PRIMARY KEY (val))"); err != nil { + if err := createTable(s, "CREATE TABLE gocql_test.invalidschemaprep (val int, PRIMARY KEY (val))"); err != nil { t.Fatal("create table:", err) } @@ -1243,7 +1238,7 @@ func TestPreparedCacheEviction(t *testing.T) { stmtsLRU.Max(4) stmtsLRU.Unlock() - if err := createTable(session, "CREATE TABLE prepcachetest (id int,mod int,PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.prepcachetest (id int,mod int,PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } //Fill the table @@ -1339,10 +1334,10 @@ func TestPreparedCacheKey(t *testing.T) { defer session2.Close() // both keyspaces have a table named "test_stmt_cache_key" - if err := createTable(session, "CREATE TABLE test_stmt_cache_key (id varchar primary key, field varchar)"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_stmt_cache_key (id varchar primary key, field varchar)"); err != nil { t.Fatal("create table:", err) } - if err := createTable(session2, "CREATE TABLE test_stmt_cache_key (id varchar primary key, field varchar)"); err != nil { + if err := createTable(session2, "CREATE TABLE gocql_test2.test_stmt_cache_key (id varchar primary key, field varchar)"); err != nil { t.Fatal("create table:", err) } @@ -1376,7 +1371,7 @@ func TestMarshalFloat64Ptr(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE float_test (id double, test double, primary key (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.float_test (id double, test double, primary key (id))"); err != nil { t.Fatal("create table:", err) } testNum := float64(7500) @@ -1390,7 +1385,7 @@ func TestMarshalInet(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE inet_test (ip inet, name text, primary key (ip))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.inet_test (ip inet, name text, primary key (ip))"); err != nil { t.Fatal("create table:", err) } stringIp := "123.34.45.56" @@ -1441,7 +1436,7 @@ func TestVarint(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE varint_test (id varchar, test varint, test2 varint, primary key (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.varint_test (id varchar, test varint, test2 varint, primary key (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1548,7 +1543,7 @@ func TestBatchStats(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE batchStats (id int, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.batchStats (id int, PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1574,7 +1569,7 @@ func TestNilInQuery(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE testNilInsert (id int, count int, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.testNilInsert (id int, count int, PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } if err := session.Query("INSERT INTO testNilInsert (id,count) VALUES (?,?)", 1, nil).Exec(); err != nil { @@ -1595,7 +1590,7 @@ func TestEmptyTimestamp(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE test_empty_timestamp (id int, time timestamp, num int, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_empty_timestamp (id int, time timestamp, num int, PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1653,7 +1648,7 @@ func TestGetTableMetadata(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE test_table_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_table_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1737,7 +1732,7 @@ func TestGetColumnMetadata(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE test_column_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_column_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1839,7 +1834,7 @@ func TestKeyspaceMetadata(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE test_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -1902,10 +1897,10 @@ func TestRoutingKey(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE test_single_routing_key (first_id int, second_id int, PRIMARY KEY (first_id, second_id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_single_routing_key (first_id int, second_id int, PRIMARY KEY (first_id, second_id))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } - if err := createTable(session, "CREATE TABLE test_composite_routing_key (first_id int, second_id int, PRIMARY KEY ((first_id, second_id)))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_composite_routing_key (first_id int, second_id int, PRIMARY KEY ((first_id, second_id)))"); err != nil { t.Fatalf("failed to create table with error '%v'", err) } @@ -2029,7 +2024,7 @@ func TestTokenAwareConnPool(t *testing.T) { t.Errorf("Expected pool size %d but was %d", cluster.NumConns*len(cluster.Hosts), session.pool.Size()) } - if err := createTable(session, "CREATE TABLE test_token_aware (id int, data text, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.test_token_aware (id int, data text, PRIMARY KEY (id))"); err != nil { t.Fatalf("failed to create test_token_aware table with err: %v", err) } query := session.Query("INSERT INTO test_token_aware (id, data) VALUES (?,?)", 42, "8 * 6 =") @@ -2128,7 +2123,7 @@ func TestManualQueryPaging(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, "CREATE TABLE testManualPaging (id int, count int, PRIMARY KEY (id))"); err != nil { + if err := createTable(session, "CREATE TABLE gocql_test.testManualPaging (id int, count int, PRIMARY KEY (id))"); err != nil { t.Fatal(err) } @@ -2177,7 +2172,7 @@ func TestLexicalUUIDType(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE test_lexical_uuid ( + if err := createTable(session, `CREATE TABLE gocql_test.test_lexical_uuid ( key varchar, column1 'org.apache.cassandra.db.marshal.LexicalUUIDType', value int, @@ -2212,7 +2207,7 @@ func TestSessionBindRoutingKey(t *testing.T) { session := createSessionFromCluster(cluster, t) defer session.Close() - if err := createTable(session, `CREATE TABLE test_bind_routing_key ( + if err := createTable(session, `CREATE TABLE gocql_test.test_bind_routing_key ( key varchar, value int, PRIMARY KEY (key) @@ -2244,7 +2239,7 @@ func TestJSONSupport(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE test_json ( + if err := createTable(session, `CREATE TABLE gocql_test.test_json ( id text PRIMARY KEY, age int, state text diff --git a/control.go b/control.go index b69cd7712..f46952458 100644 --- a/control.go +++ b/control.go @@ -110,7 +110,7 @@ func (c *controlConn) HandleError(conn *Conn, err error, closed bool) { oldConn := c.conn.Load().(*Conn) if oldConn != conn { - panic("controlConn: got error for connection which we did not create") + return } c.reconnect() @@ -151,11 +151,8 @@ func (c *controlConn) query(statement string, values ...interface{}) (iter *Iter } iter = conn.executeQuery(q) - if iter.err == nil { - break - } - - if !c.retry.Attempt(q) { + q.attempts++ + if iter.err == nil || !c.retry.Attempt(q) { break } } diff --git a/errors_test.go b/errors_test.go index 8c4a588df..b774d8a34 100644 --- a/errors_test.go +++ b/errors_test.go @@ -10,20 +10,20 @@ func TestErrorsParse(t *testing.T) { session := createSession(t) defer session.Close() - if err := createTable(session, `CREATE TABLE errors_parse (id int primary key)`); err != nil { + if err := createTable(session, `CREATE TABLE gocql_test.errors_parse (id int primary key)`); err != nil { t.Fatal("create:", err) } - if err := createTable(session, `CREATE TABLE errors_parse (id int primary key)`); err == nil { + if err := createTable(session, `CREATE TABLE gocql_test.errors_parse (id int primary key)`); err == nil { t.Fatal("Should have gotten already exists error from cassandra server.") } else { switch e := err.(type) { case *RequestErrAlreadyExists: if e.Table != "errors_parse" { - t.Fatal("Failed to parse error response from cassandra for ErrAlreadyExists.") + t.Fatalf("expected error table to be 'errors_parse' but was %q", e.Table) } default: - t.Fatal("Failed to parse error response from cassandra for ErrAlreadyExists.") + t.Fatalf("expected to get RequestErrAlreadyExists instead got %T", e) } } } diff --git a/session.go b/session.go index a14919ea8..799f099ce 100644 --- a/session.go +++ b/session.go @@ -222,8 +222,12 @@ func (s *Session) executeQuery(qry *Query) *Iter { //Assign the error unavailable to the iterator if conn == nil { - iter = &Iter{err: ErrNoConnections} - break + if qry.rt == nil || !qry.rt.Attempt(qry) { + iter = &Iter{err: ErrNoConnections} + break + } + + continue } t := time.Now() diff --git a/tuple_test.go b/tuple_test.go index bf94191f6..e9381f8b6 100644 --- a/tuple_test.go +++ b/tuple_test.go @@ -12,7 +12,7 @@ func TestTupleSimple(t *testing.T) { session := createSession(t) defer session.Close() - err := createTable(session, `CREATE TABLE tuple_test( + err := createTable(session, `CREATE TABLE gocql_test.tuple_test( id int, coord frozen>, diff --git a/udt_test.go b/udt_test.go index c53d99479..dc96947bb 100644 --- a/udt_test.go +++ b/udt_test.go @@ -51,7 +51,7 @@ func TestUDT_Marshaler(t *testing.T) { session := createSession(t) defer session.Close() - err := createTable(session, `CREATE TYPE position( + err := createTable(session, `CREATE TYPE gocql_test.position( lat int, lon int, padding text);`) @@ -59,7 +59,7 @@ func TestUDT_Marshaler(t *testing.T) { t.Fatal(err) } - err = createTable(session, `CREATE TABLE houses( + err = createTable(session, `CREATE TABLE gocql_test.houses( id int, name text, loc frozen, @@ -108,14 +108,14 @@ func TestUDT_Reflect(t *testing.T) { session := createSession(t) defer session.Close() - err := createTable(session, `CREATE TYPE horse( + err := createTable(session, `CREATE TYPE gocql_test.horse( name text, owner text);`) if err != nil { t.Fatal(err) } - err = createTable(session, `CREATE TABLE horse_race( + err = createTable(session, `CREATE TABLE gocql_test.horse_race( position int, horse frozen, @@ -167,14 +167,14 @@ func TestUDT_Proto2error(t *testing.T) { } defer session.Close() - err = createTable(session, `CREATE TYPE fish( + err = createTable(session, `CREATE TYPE gocql_test.fish( name text, owner text);`) if err != nil { t.Fatal(err) } - err = createTable(session, `CREATE TABLE fish_race( + err = createTable(session, `CREATE TABLE gocql_test.fish_race( position int, fish frozen, @@ -208,14 +208,14 @@ func TestUDT_NullObject(t *testing.T) { session := createSession(t) defer session.Close() - err := createTable(session, `CREATE TYPE udt_null_type( + err := createTable(session, `CREATE TYPE gocql_test.udt_null_type( name text, owner text);`) if err != nil { t.Fatal(err) } - err = createTable(session, `CREATE TABLE udt_null_table( + err = createTable(session, `CREATE TABLE gocql_test.udt_null_table( id uuid, udt_col frozen, @@ -262,7 +262,7 @@ func TestMapScanUDT(t *testing.T) { session := createSession(t) defer session.Close() - err := createTable(session, `CREATE TYPE log_entry ( + err := createTable(session, `CREATE TYPE gocql_test.log_entry ( created_timestamp timestamp, message text );`) @@ -270,7 +270,7 @@ func TestMapScanUDT(t *testing.T) { t.Fatal(err) } - err = createTable(session, `CREATE TABLE requests_by_id ( + err = createTable(session, `CREATE TABLE gocql_test.requests_by_id ( id uuid PRIMARY KEY, type int, log_entries list> diff --git a/wiki_test.go b/wiki_test.go index ed95400b7..a762a9aff 100644 --- a/wiki_test.go +++ b/wiki_test.go @@ -56,11 +56,11 @@ type WikiTest struct { func CreateSchema(session *Session, tb testing.TB, table string) *WikiTest { table = "wiki_" + table - if err := session.Query(fmt.Sprintf("DROP TABLE IF EXISTS %s", table)).Exec(); err != nil { + if err := createTable(session, fmt.Sprintf("DROP TABLE IF EXISTS gocql_test.%s", table)); err != nil { tb.Fatal("CreateSchema:", err) } - err := createTable(session, fmt.Sprintf(`CREATE TABLE %s ( + err := createTable(session, fmt.Sprintf(`CREATE TABLE gocql_test.%s ( title varchar, revid timeuuid, body varchar,