From f7a1b9e4c25a61e470738744984bd64bef6223c7 Mon Sep 17 00:00:00 2001 From: Ralf Fischer Date: Mon, 3 Apr 2017 16:25:12 -0700 Subject: [PATCH 1/2] unique check: pass in actual value, not string version --- model.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/model.go b/model.go index f2eef78..ff07659 100644 --- a/model.go +++ b/model.go @@ -255,9 +255,9 @@ func Unique(m interface{}, db *Database, update bool, err Error) { c := db.Col(col) jname := Tag(m, fname, "json") if jname != "" { - uniq, _ = c.Unique(jname, field.String(), update, "") + uniq, _ = c.Unique(jname, field.Interface(), update, "") } else { - uniq, _ = c.Unique(fname, field.String(), update, "") + uniq, _ = c.Unique(fname, field.Interface(), update, "") } } if !uniq { @@ -278,9 +278,9 @@ func unique(m reflect.Value, val map[string]string, db *Database, uniq *bool, up // search by example jname := Tag(m, fname, "json") if jname != "" { - *uniq, _ = db.Col(col).Unique(jname, field.String(), update, "") + *uniq, _ = db.Col(col).Unique(jname, field.Interface(), update, "") } else { - *uniq, _ = db.Col(col).Unique(fname, field.String(), update, "") + *uniq, _ = db.Col(col).Unique(fname, field.Interface(), update, "") } } if !*uniq { From 310418c38a99b8b228deff2b107e12ca66571a52 Mon Sep 17 00:00:00 2001 From: Ralf Fischer Date: Tue, 4 Apr 2017 09:49:46 -0700 Subject: [PATCH 2/2] spin up arangodb in wercker --- .gitignore | 1 + config_test.go | 16 ++++++++++++++++ simple_test.go | 4 ++-- wercker.yml | 27 +++++++++++++++++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 wercker.yml diff --git a/.gitignore b/.gitignore index 160100b..0a21202 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ _testmain.go *.test .* +.wercker \ No newline at end of file diff --git a/config_test.go b/config_test.go index c065bde..8f81b1e 100644 --- a/config_test.go +++ b/config_test.go @@ -1,5 +1,11 @@ package aranGO +import ( + "fmt" + "log" + "os" +) + // Configure to start testing var ( TestCollection = "TestCollection" @@ -13,6 +19,16 @@ var ( s *Session ) +func init() { + if wercker := os.Getenv("WERCKER"); wercker == "true" { + log.Printf("Found WERCKER env!") + arangoPort := os.Getenv("ARANGODB_PORT_8529_TCP_PORT") + arangoIP := os.Getenv("ARANGODB_PORT_8529_TCP_ADDR") + TestServer = fmt.Sprintf("http://%s:%s", arangoIP, arangoPort) + } + log.Printf("using TestServer at %s", TestServer) +} + // document to test type DocTest struct { Document // arango Document to save id, key, rev diff --git a/simple_test.go b/simple_test.go index 294dc03..b61aea6 100644 --- a/simple_test.go +++ b/simple_test.go @@ -2,6 +2,7 @@ package aranGO import ( "testing" + "github.com/stretchr/testify/assert" ) @@ -40,7 +41,7 @@ func TestSimple(t *testing.T) { // Example TestDoc = DocTest{} // Clean TestDoc variable - cur, err := c.Example(map[string]interface{}{"Text" : TestString}, 0, 10) + cur, err := c.Example(map[string]interface{}{"Text": TestString}, 0, 10) assert.Equal(t, TestDoc.Error, false) assert.Nil(t, err) assert.NotNil(t, cur) @@ -51,5 +52,4 @@ func TestSimple(t *testing.T) { assert.Equal(t, TestString, TestDoc.Text) // need to add new functions! - } diff --git a/wercker.yml b/wercker.yml new file mode 100644 index 0000000..16fc6da --- /dev/null +++ b/wercker.yml @@ -0,0 +1,27 @@ +box: golang +services: + - id: arangodb + env: + ARANGO_NO_AUTH: 1 +build: + steps: + - install-packages: + packages: netcat + - setup-go-workspace: + package-dir: github.com/diegogub/aranGO + - script: + name: go get + code: | + go get -t + - script: + name: go build + code: | + go build ./... + - script: + name: Wait for Arangodb connection if it is slow + code: | + while ! nc -nvz $ARANGODB_PORT_8529_TCP_ADDR $ARANGODB_PORT_8529_TCP_PORT ; do echo "."; sleep 2; done + - script: + name: go test + code: | + go test ./...