Skip to content

Commit

Permalink
Remove Query prefix from Session methods
Browse files Browse the repository at this point in the history
  • Loading branch information
@willfaught
willfaught committed Mar 30, 2016
1 parent 261969e commit 559ab12
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion batch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ func TestBatch(t *testing.T) {
var execs = newSession(t)

var exec = func(q string) {
if err := execs.QueryExec(q); err != nil {
if err := execs.Exec(q); err != nil {
t.Fatalf("Actual error %v, expected no error", err)
}
}
Expand Down
10 changes: 5 additions & 5 deletions examples_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func ExampleBatch() {
}

func ExampleIterator() {
var i = mySession.QueryIterator("select * from users")
var i = mySession.Iterate("select * from users")

for done := false; !done; {
var m = map[string]interface{}{}
Expand All @@ -30,7 +30,7 @@ func ExampleIterator() {
}

func ExampleSession() {
var rows, _ = mySession.QueryScanMapSlice("select * from users")
var rows, _ = mySession.ScanMapSlice("select * from users")

for _, row := range rows {
fmt.Println(row)
Expand All @@ -49,7 +49,7 @@ func init() {

i.When("Close").Return(nil)

mySession.When("QueryExec", mock.Any).Return(nil)
mySession.When("QueryIterator", mock.Any).Return(i)
mySession.When("QueryScanMap", mock.Any).Return(map[string]interface{}{"id": 1, "name": "me"}, nil)
mySession.When("Exec", mock.Any).Return(nil)
mySession.When("Iterate", mock.Any).Return(i)
mySession.When("ScanMap", mock.Any).Return(map[string]interface{}{"id": 1, "name": "me"}, nil)
}
6 changes: 3 additions & 3 deletions iterator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func TestIterator(t *testing.T) {
defer s.Close()

var exec = func(q string) {
if err := s.QueryExec(q); err != nil {
if err := s.Exec(q); err != nil {
t.Fatalf("Actual error %v, expected no error", err)
}
}
Expand All @@ -28,7 +28,7 @@ func TestIterator(t *testing.T) {

exec(rowInsert)

if i := s.QueryIterator("select * from gockle_test.test"); i == nil {
if i := s.Iterate("select * from gockle_test.test"); i == nil {
t.Error("Actual iterator nil, expected not nil")
} else {
var id, n int
Expand All @@ -50,7 +50,7 @@ func TestIterator(t *testing.T) {
}
}

if i := s.QueryIterator("select * from gockle_test.test"); i == nil {
if i := s.Iterate("select * from gockle_test.test"); i == nil {
t.Error("Actual iterator nil, expected not nil")
} else {
var a = map[string]interface{}{}
Expand Down
104 changes: 52 additions & 52 deletions session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ func metadata(s *gocql.Session, keyspace string) (*gocql.KeyspaceMetadata, error
// Session is a Cassandra connection. The Query methods run CQL queries. The
// Columns and Tables methods provide simple metadata.
type Session interface {
// Batch returns a new Batch for the Session.
Batch(kind BatchKind) Batch

// Close closes the Session.
Close()

Expand All @@ -32,32 +35,29 @@ type Session interface {
// Session to observe them.
Columns(keyspace, table string) (map[string]gocql.TypeInfo, error)

// Batch returns a Batch for the Session.
Batch(kind BatchKind) Batch
// Exec executes the query for statement and arguments.
Exec(statement string, arguments ...interface{}) error

// QueryExec executes the query for statement and arguments.
QueryExec(statement string, arguments ...interface{}) error

// QueryIterator executes the query for statement and arguments and returns an
// Iterate executes the query for statement and arguments and returns an
// Iterator for the results.
QueryIterator(statement string, arguments ...interface{}) Iterator
Iterate(statement string, arguments ...interface{}) Iterator

// QueryScan executes the query for statement and arguments and puts the first
// Scan executes the query for statement and arguments and puts the first
// result row in results.
QueryScan(statement string, arguments, results []interface{}) error
Scan(statement string, arguments, results []interface{}) error

// QueryScanMap executes the query for statement and arguments and puts the
// first result row in results.
QueryScanMap(statement string, arguments []interface{}, results map[string]interface{}) error
// ScanMap executes the query for statement and arguments and puts the first
// result row in results.
ScanMap(statement string, arguments []interface{}, results map[string]interface{}) error

// QueryScanMapTx executes the query for statement and arguments as a
// lightweight transaction. If the query is not applied, it puts the current
// values for the columns in results. It returns whether the query is applied.
QueryScanMapTx(statement string, arguments []interface{}, results map[string]interface{}) (bool, error)
// ScanMapSlice executes the query for statement and arguments and returns all
// the result rows.
ScanMapSlice(statement string, arguments ...interface{}) ([]map[string]interface{}, error)

// QueryScanMapSlice executes the query for statement and arguments and returns
// all the result rows.
QueryScanMapSlice(statement string, arguments ...interface{}) ([]map[string]interface{}, error)
// ScanMapTx executes the query for statement and arguments as a lightweight
// transaction. If the query is not applied, it puts the current values for the
// columns in results. It returns whether the query is applied.
ScanMapTx(statement string, arguments []interface{}, results map[string]interface{}) (bool, error)

// Tables returns the table names for keyspace. Schema changes during a session
// are not reflected; you must open a new Session to observe them.
Expand Down Expand Up @@ -95,6 +95,11 @@ type SessionMock struct {
mock.Mock
}

// Batch implements Session.
func (m SessionMock) Batch(kind BatchKind) Batch {
return m.Called(kind).Get(0).(Batch)
}

// Close implements Session.
func (m SessionMock) Close() {
m.Called()
Expand All @@ -107,43 +112,38 @@ func (m SessionMock) Columns(keyspace, table string) (map[string]gocql.TypeInfo,
return r.Get(0).(map[string]gocql.TypeInfo), r.Error(1)
}

// Batch implements Session.
func (m SessionMock) Batch(kind BatchKind) Batch {
return m.Called(kind).Get(0).(Batch)
}

// QueryExec implements Session.
func (m SessionMock) QueryExec(statement string, arguments ...interface{}) error {
// Exec implements Session.
func (m SessionMock) Exec(statement string, arguments ...interface{}) error {
return m.Called(statement, arguments).Error(0)
}

// QueryIterator implements Session.
func (m SessionMock) QueryIterator(statement string, arguments ...interface{}) Iterator {
// Iterate implements Session.
func (m SessionMock) Iterate(statement string, arguments ...interface{}) Iterator {
return m.Called(statement, arguments).Get(0).(Iterator)
}

// QueryScan implements Session.
func (m SessionMock) QueryScan(statement string, arguments, results []interface{}) error {
// Scan implements Session.
func (m SessionMock) Scan(statement string, arguments, results []interface{}) error {
return m.Called(statement, arguments, results).Error(0)
}

// QueryScanMap implements Session.
func (m SessionMock) QueryScanMap(statement string, arguments []interface{}, results map[string]interface{}) error {
// ScanMap implements Session.
func (m SessionMock) ScanMap(statement string, arguments []interface{}, results map[string]interface{}) error {
return m.Called(statement, arguments, results).Error(0)
}

// QueryScanMapTx implements Session.
func (m SessionMock) QueryScanMapTx(statement string, arguments []interface{}, results map[string]interface{}) (bool, error) {
var r = m.Called(statement, arguments, results)
// ScanMapSlice implements Session.
func (m SessionMock) ScanMapSlice(statement string, arguments ...interface{}) ([]map[string]interface{}, error) {
var r = m.Called(statement, arguments)

return r.Bool(0), r.Error(1)
return r.Get(0).([]map[string]interface{}), r.Error(1)
}

// QueryScanMapSlice implements Session.
func (m SessionMock) QueryScanMapSlice(statement string, arguments ...interface{}) ([]map[string]interface{}, error) {
var r = m.Called(statement, arguments)
// ScanMapTx implements Session.
func (m SessionMock) ScanMapTx(statement string, arguments []interface{}, results map[string]interface{}) (bool, error) {
var r = m.Called(statement, arguments, results)

return r.Get(0).([]map[string]interface{}), r.Error(1)
return r.Bool(0), r.Error(1)
}

// Tables implements Session.
Expand All @@ -157,6 +157,10 @@ type session struct {
s *gocql.Session
}

func (s session) Batch(kind BatchKind) Batch {
return batch{b: s.s.NewBatch(gocql.BatchType(kind)), s: s.s}
}

func (s session) Close() {
s.s.Close()
}
Expand All @@ -183,32 +187,28 @@ func (s session) Columns(keyspace, table string) (map[string]gocql.TypeInfo, err
return types, nil
}

func (s session) Batch(kind BatchKind) Batch {
return batch{b: s.s.NewBatch(gocql.BatchType(kind)), s: s.s}
}

func (s session) QueryExec(statement string, arguments ...interface{}) error {
func (s session) Exec(statement string, arguments ...interface{}) error {
return s.s.Query(statement, arguments...).Exec()
}

func (s session) QueryIterator(statement string, arguments ...interface{}) Iterator {
func (s session) Iterate(statement string, arguments ...interface{}) Iterator {
return iterator{i: s.s.Query(statement, arguments...).Iter()}
}

func (s session) QueryScan(statement string, arguments, results []interface{}) error {
func (s session) Scan(statement string, arguments, results []interface{}) error {
return s.s.Query(statement, arguments...).Scan(results...)
}

func (s session) QueryScanMap(statement string, arguments []interface{}, results map[string]interface{}) error {
func (s session) ScanMap(statement string, arguments []interface{}, results map[string]interface{}) error {
return s.s.Query(statement, arguments...).MapScan(results)
}

func (s session) QueryScanMapTx(statement string, arguments []interface{}, results map[string]interface{}) (bool, error) {
return s.s.Query(statement, arguments...).MapScanCAS(results)
func (s session) ScanMapSlice(statement string, arguments ...interface{}) ([]map[string]interface{}, error) {
return s.s.Query(statement, arguments...).Iter().SliceMap()
}

func (s session) QueryScanMapSlice(statement string, arguments ...interface{}) ([]map[string]interface{}, error) {
return s.s.Query(statement, arguments...).Iter().SliceMap()
func (s session) ScanMapTx(statement string, arguments []interface{}, results map[string]interface{}) (bool, error) {
return s.s.Query(statement, arguments...).MapScanCAS(results)
}

func (s session) Tables(keyspace string) ([]string, error) {
Expand Down
48 changes: 24 additions & 24 deletions session_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestNewSimpleSession(t *testing.T) {

func TestSessionMetadata(t *testing.T) {
var exec = func(s Session, q string) {
if err := s.QueryExec(q); err != nil {
if err := s.Exec(q); err != nil {
t.Fatalf("Actual error %v, expected no error", err)
}
}
Expand Down Expand Up @@ -138,18 +138,18 @@ func TestSessionMock(t *testing.T) {
{"Columns", []interface{}{"a", "b"}, []interface{}{map[string]gocql.TypeInfo{"c": gocql.NativeType{}}, e}},
{"Batch", []interface{}{BatchKind(0)}, []interface{}{(*batch)(nil)}},
{"Batch", []interface{}{BatchKind(1)}, []interface{}{&batch{}}},
{"QueryExec", []interface{}{"", []interface{}(nil)}, []interface{}{nil}},
{"QueryExec", []interface{}{"a", []interface{}{1}}, []interface{}{e}},
{"QueryIterator", []interface{}{"", []interface{}(nil)}, []interface{}{(*iterator)(nil)}},
{"QueryIterator", []interface{}{"a", []interface{}{1}}, []interface{}{iterator{}}},
{"QueryScan", []interface{}{"", []interface{}(nil), []interface{}(nil)}, []interface{}{nil}},
{"QueryScan", []interface{}{"a", []interface{}{1}, []interface{}{1}}, []interface{}{e}},
{"QueryScanMap", []interface{}{"", []interface{}(nil), map[string]interface{}(nil)}, []interface{}{nil}},
{"QueryScanMap", []interface{}{"a", []interface{}{1}, map[string]interface{}{"b": 2}}, []interface{}{e}},
{"QueryScanMapTx", []interface{}{"", []interface{}(nil), map[string]interface{}(nil)}, []interface{}{false, nil}},
{"QueryScanMapTx", []interface{}{"a", []interface{}{1}, map[string]interface{}{"b": 2}}, []interface{}{true, e}},
{"QueryScanMapSlice", []interface{}{"", []interface{}(nil)}, []interface{}{[]map[string]interface{}(nil), nil}},
{"QueryScanMapSlice", []interface{}{"a", []interface{}{1}}, []interface{}{[]map[string]interface{}{{"b": 2}}, e}},
{"Exec", []interface{}{"", []interface{}(nil)}, []interface{}{nil}},
{"Exec", []interface{}{"a", []interface{}{1}}, []interface{}{e}},
{"Iterate", []interface{}{"", []interface{}(nil)}, []interface{}{(*iterator)(nil)}},
{"Iterate", []interface{}{"a", []interface{}{1}}, []interface{}{iterator{}}},
{"Scan", []interface{}{"", []interface{}(nil), []interface{}(nil)}, []interface{}{nil}},
{"Scan", []interface{}{"a", []interface{}{1}, []interface{}{1}}, []interface{}{e}},
{"ScanMap", []interface{}{"", []interface{}(nil), map[string]interface{}(nil)}, []interface{}{nil}},
{"ScanMap", []interface{}{"a", []interface{}{1}, map[string]interface{}{"b": 2}}, []interface{}{e}},
{"ScanMapTx", []interface{}{"", []interface{}(nil), map[string]interface{}(nil)}, []interface{}{false, nil}},
{"ScanMapTx", []interface{}{"a", []interface{}{1}, map[string]interface{}{"b": 2}}, []interface{}{true, e}},
{"ScanMapSlice", []interface{}{"", []interface{}(nil)}, []interface{}{[]map[string]interface{}(nil), nil}},
{"ScanMapSlice", []interface{}{"a", []interface{}{1}}, []interface{}{[]map[string]interface{}{{"b": 2}}, e}},
{"Tables", []interface{}{""}, []interface{}{[]string(nil), nil}},
{"Tables", []interface{}{"a"}, []interface{}{[]string{"b"}, e}},
})
Expand All @@ -161,7 +161,7 @@ func TestSessionQuery(t *testing.T) {
defer s.Close()

var exec = func(q string) {
if err := s.QueryExec(q); err != nil {
if err := s.Exec(q); err != nil {
t.Fatalf("Actual error %v, expected no error", err)
}
}
Expand All @@ -182,15 +182,15 @@ func TestSessionQuery(t *testing.T) {
t.Error("Actual batch nil, expected not nil")
}

// QueryIterator
if s.QueryIterator("select * from gockle_test.test") == nil {
// Iterate
if s.Iterate("select * from gockle_test.test") == nil {
t.Error("Actual iterator nil, expected not nil")
}

// QueryScan
// Scan
var id, n int

if err := s.QueryScan("select id, n from gockle_test.test", nil, []interface{}{&id, &n}); err == nil {
if err := s.Scan("select id, n from gockle_test.test", nil, []interface{}{&id, &n}); err == nil {
if id != 1 {
t.Errorf("Actual id %v, expected 1", id)
}
Expand All @@ -202,21 +202,21 @@ func TestSessionQuery(t *testing.T) {
t.Errorf("Actual error %v, expected no error", err)
}

// QueryScanMap
// ScanMap
var am, em = map[string]interface{}{}, map[string]interface{}{"id": 1, "n": 2}

if err := s.QueryScanMap("select id, n from gockle_test.test", nil, am); err == nil {
if err := s.ScanMap("select id, n from gockle_test.test", nil, am); err == nil {
if !reflect.DeepEqual(am, em) {
t.Errorf("Actual map %v, expected %v", am, em)
}
} else {
t.Errorf("Actual error %v, expected no error", err)
}

// QueryScanMapTx
// ScanMapTx
am = map[string]interface{}{}

if b, err := s.QueryScanMapTx("update gockle_test.test set n = 3 where id = 1 if n = 2", nil, am); err == nil {
if b, err := s.ScanMapTx("update gockle_test.test set n = 3 where id = 1 if n = 2", nil, am); err == nil {
if !b {
t.Error("Actual applied false, expected true")
}
Expand All @@ -228,10 +228,10 @@ func TestSessionQuery(t *testing.T) {
t.Errorf("Actual error %v, expected no error", err)
}

// QueryScanMapSlice
// ScanMapSlice
var es = []map[string]interface{}{{"id": 1, "n": 3}}

if as, err := s.QueryScanMapSlice("select * from gockle_test.test"); err == nil {
if as, err := s.ScanMapSlice("select * from gockle_test.test"); err == nil {
if !reflect.DeepEqual(as, es) {
t.Errorf("Actual rows %v, expected %v", as, es)
}
Expand Down

0 comments on commit 559ab12

Please sign in to comment.