Merge pull request #145 from aacanakin/master

Organize test structure, integrate go modules

Author: aacanakin

.travis.yml

@@ -12,8 +12,14 @@ addons:
 go:
     - tip
 
+before_install:
+  - go get github.com/mattn/goveralls
+
 install:
-    - go get -u -v -t github.com/aacanakin/qb
+    - go get -v github.com/lib/pq
+    - go get -v github.com/go-sql-driver/mysql
+    - go get -v github.com/mattn/go-sqlite3
+    - go get -t -v ./...
 
 script:
     - go test -v -covermode=count -coverprofile=coverage.out
@@ -23,7 +29,7 @@ script:
     - tail --lines +2 sqlite.out >> coverage.out
     - tail --lines +2 postgres.out >> coverage.out
     - tail --lines +2 mysql.out >> coverage.out
-    - $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken 0yIEy3NVX2lXn3KxYzHjkla7EWGjvmLAp
+    - $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken 0yIEy3NVX2lXn3KxYzHjkla7EWGjvmLAp
 
 before_script:
   - mysql -e 'create database IF NOT EXISTS qb_test;'

README.md

@@ -2,8 +2,7 @@
 
 # qb - the database toolkit for go
 
-[![Join the chat at https://gitter.im/aacanakin/qb](https://badges.gitter.im/aacanakin/qb.svg)](https://gitter.im/aacanakin/qb?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/aacanakin/qb.svg?branch=master)](https://travis-ci.org/aacanakin/qb)
+[![Build Status](https://travis-ci.org/slicebit/qb.svg?branch=master)](https://travis-ci.org/slicebit/qb)
 [![Coverage Status](https://coveralls.io/repos/github/slicebit/qb/badge.svg?branch=master)](https://coveralls.io/github/slicebit/qb?branch=master)
 [![License (LGPL version 2.1)](https://img.shields.io/badge/license-GNU%20LGPL%20version%202.1-brightgreen.svg?style=flat)](http://opensource.org/licenses/LGPL-2.1)
 [![Go Report Card](https://goreportcard.com/badge/github.com/slicebit/qb)](https://goreportcard.com/report/github.com/slicebit/qb)

column_test.go

@@ -1,94 +1,137 @@
 package qb
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
-)
 
-func TestColumn(t *testing.T) {
-	dialect := NewDialect("default")
+	"github.com/stretchr/testify/suite"
 
-	col := Column("id", Varchar().Size(40))
-	assert.Equal(t, "id", col.Name)
-	assert.Equal(t, Varchar().Size(40), col.Type)
+	"github.com/stretchr/testify/assert"
+)
 
-	assert.Equal(t, "id VARCHAR(40)", col.String(dialect))
+type ColumnTestSuite struct {
+	suite.Suite
+	dialect Dialect
+	ctx     *CompilerContext
+}
 
-	col = Column("s", Varchar().Size(255)).Unique().NotNull().Default("hello")
-	assert.Equal(t, "s VARCHAR(255) UNIQUE NOT NULL DEFAULT 'hello'", col.String(dialect))
+func (suite *ColumnTestSuite) SetupTest() {
+	suite.dialect = NewDefaultDialect()
+	suite.ctx = NewCompilerContext(suite.dialect)
+}
 
-	precisionCol := Column("f", Type("FLOAT").Precision(2, 5)).Null()
-	assert.Equal(t, "f FLOAT(2, 5) NULL", precisionCol.String(dialect))
+func (suite *ColumnTestSuite) TestColumnVarcharSpecificSize() {
+	col := Column("id", Varchar().Size(40))
+	assert.Equal(suite.T(), "id", col.Name)
+	assert.Equal(suite.T(), Varchar().Size(40), col.Type)
+	assert.Equal(suite.T(), "id VARCHAR(40)", col.String(suite.dialect))
+}
 
-	col = Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
+func (suite *ColumnTestSuite) TestColumnVarcharUniqueNotNullDefault() {
+	col := Column("s", Varchar().Size(255)).Unique().NotNull().Default("hello")
+	assert.Equal(suite.T(), "s VARCHAR(255) UNIQUE NOT NULL DEFAULT 'hello'", col.String(suite.dialect))
+}
 
-	assert.Equal(t, "id INT PRIMARY KEY AUTO INCREMENT", col.String(dialect))
+func (suite *ColumnTestSuite) TestColumnFloatPrecision() {
+	col := Column("f", Type("FLOAT").Precision(2, 5)).Null()
+	assert.Equal(suite.T(), "f FLOAT(2, 5) NULL", col.String(suite.dialect))
+}
 
-	assert.Equal(t, "c INT TEST", Column("c", Int()).Constraint("TEST").String(dialect))
+func (suite *ColumnTestSuite) TestColumnIntInlinePrimaryKeyAutoIncrement() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
+	assert.Equal(suite.T(), "id INT PRIMARY KEY AUTO INCREMENT", col.String(suite.dialect))
+	assert.Equal(suite.T(), "c INT TEST", Column("c", Int()).Constraint("TEST").String(suite.dialect))
+}
 
-	// like
+func (suite *ColumnTestSuite) TestColumnLike() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	like := col.Like("s%")
-	sql, binds := asDefSQLBinds(like)
 
-	assert.Equal(t, "id LIKE ?", sql)
-	assert.Equal(t, []interface{}{"s%"}, binds)
+	sql := like.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	// not in
-	notIn := col.NotIn("id1", "id2")
-	sql, binds = asDefSQLBinds(notIn)
+	assert.Equal(suite.T(), "id LIKE ?", sql)
+	assert.Equal(suite.T(), []interface{}{"s%"}, binds)
+}
 
-	assert.Equal(t, "id NOT IN (?, ?)", sql)
-	assert.Equal(t, []interface{}{"id1", "id2"}, binds)
+func (suite *ColumnTestSuite) TestColumnNotIn() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
+	notIn := col.NotIn("id1", "id2")
+	sql := notIn.Accept(suite.ctx)
+	binds := suite.ctx.Binds
+	assert.Equal(suite.T(), "id NOT IN (?, ?)", sql)
+	assert.Equal(suite.T(), []interface{}{"id1", "id2"}, binds)
+}
 
-	// in
+func (suite *ColumnTestSuite) TestColumnIn() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	in := col.In("id1", "id2")
-	sql, binds = asDefSQLBinds(in)
+	sql := in.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id IN (?, ?)", sql)
-	assert.Equal(t, []interface{}{"id1", "id2"}, binds)
+	assert.Equal(suite.T(), "id IN (?, ?)", sql)
+	assert.Equal(suite.T(), []interface{}{"id1", "id2"}, binds)
+}
 
-	// not eq
+func (suite *ColumnTestSuite) TestColumnNotEq() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	notEq := col.NotEq("id1")
-	sql, binds = asDefSQLBinds(notEq)
+	sql := notEq.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id != ?", sql)
-	assert.Equal(t, []interface{}{"id1"}, binds)
+	assert.Equal(suite.T(), "id != ?", sql)
+	assert.Equal(suite.T(), []interface{}{"id1"}, binds)
+}
 
-	// eq
+func (suite *ColumnTestSuite) TestColumnEq() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	eq := col.Eq("id1")
-	sql, binds = asDefSQLBinds(eq)
+	sql := eq.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id = ?", sql)
-	assert.Equal(t, []interface{}{"id1"}, binds)
+	assert.Equal(suite.T(), "id = ?", sql)
+	assert.Equal(suite.T(), []interface{}{"id1"}, binds)
+}
 
-	// gt
+func (suite *ColumnTestSuite) TestColumnGt() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	gt := col.Gt("id1")
-	sql, binds = asDefSQLBinds(gt)
+	sql := gt.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id > ?", sql)
-	assert.Equal(t, []interface{}{"id1"}, binds)
+	assert.Equal(suite.T(), "id > ?", sql)
+	assert.Equal(suite.T(), []interface{}{"id1"}, binds)
+}
 
-	// lt
+func (suite *ColumnTestSuite) TestColumnLt() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	lt := col.Lt("id1")
-	sql, binds = asDefSQLBinds(lt)
+	sql := lt.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id < ?", sql)
-	assert.Equal(t, []interface{}{"id1"}, binds)
+	assert.Equal(suite.T(), "id < ?", sql)
+	assert.Equal(suite.T(), []interface{}{"id1"}, binds)
+}
 
-	// gte
+func (suite *ColumnTestSuite) TestcolumnGte() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	gte := col.Gte("id1")
-	sql, binds = asDefSQLBinds(gte)
+	sql := gte.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id >= ?", sql)
-	assert.Equal(t, []interface{}{"id1"}, binds)
+	assert.Equal(suite.T(), "id >= ?", sql)
+	assert.Equal(suite.T(), []interface{}{"id1"}, binds)
+}
 
-	// lte
+func (suite *ColumnTestSuite) TestColumnLte() {
+	col := Column("id", Int()).PrimaryKey().AutoIncrement().inlinePrimaryKey()
 	lte := col.Lte("id1")
-	sql, binds = asDefSQLBinds(lte)
+	sql := lte.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	assert.Equal(t, "id <= ?", sql)
-	assert.Equal(t, []interface{}{"id1"}, binds)
+	assert.Equal(suite.T(), "id <= ?", sql)
+	assert.Equal(suite.T(), []interface{}{"id1"}, binds)
+}
 
-	sql = col.Accept(NewCompilerContext(dialect))
-	assert.Equal(t, "id", sql)
+func TestColumnTestSuite(t *testing.T) {
+	suite.Run(t, new(ColumnTestSuite))
 }

combiner_test.go

@@ -1,24 +1,48 @@
 package qb
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/suite"
+
+	"github.com/stretchr/testify/assert"
 )
 
-func TestCombiners(t *testing.T) {
+type CombinerTestSuite struct {
+	suite.Suite
+	dialect Dialect
+	ctx     *CompilerContext
+}
+
+func (suite *CombinerTestSuite) SetupTest() {
+	suite.dialect = NewDefaultDialect()
+	suite.ctx = NewCompilerContext(suite.dialect)
+}
+
+func (suite *CombinerTestSuite) TestCombinerAnd() {
 	email := Column("email", Varchar()).NotNull().Unique()
 	id := Column("id", Int()).NotNull()
 
 	and := And(Eq(email, "[email protected]"), NotEq(id, 1))
-	or := Or(Eq(email, "[email protected]"), NotEq(id, 1))
+	sql := and.Accept(suite.ctx)
+	binds := suite.ctx.Binds
 
-	sql, binds := asDefSQLBinds(and)
+	assert.Equal(suite.T(), "(email = ? AND id != ?)", sql)
+	assert.Equal(suite.T(), []interface{}{"[email protected]", 1}, binds)
+}
 
-	assert.Equal(t, "(email = ? AND id != ?)", sql)
-	assert.Equal(t, []interface{}{"[email protected]", 1}, binds)
+func (suite *CombinerTestSuite) TestCombinerOr() {
+	email := Column("email", Varchar()).NotNull().Unique()
+	id := Column("id", Int()).NotNull()
 
-	sql, binds = asDefSQLBinds(or)
+	or := Or(Eq(email, "[email protected]"), NotEq(id, 1))
+	sql := or.Accept(suite.ctx)
+	binds := suite.ctx.Binds
+
+	assert.Equal(suite.T(), "(email = ? OR id != ?)", sql)
+	assert.Equal(suite.T(), []interface{}{"[email protected]", 1}, binds)
+}
 
-	assert.Equal(t, "(email = ? OR id != ?)", sql)
-	assert.Equal(t, []interface{}{"[email protected]", 1}, binds)
+func TestCombinerTestSuite(t *testing.T) {
+	suite.Run(t, new(CombinerTestSuite))
 }