test migration

golang-migrate · dhui · Jan 20, 2020 · Jan 6, 2020 · Jan 6, 2020 · Jan 6, 2020
commit a4e737011176178ff36a53feb70eeb3857440a84
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ cli/migrate
 .godoc.pid
 vendor/
 .vscode/
+.idea/
diff --git a/database/neo4j/examples/migrations/1578421040_create_movies_constraint.down.cypher b/database/neo4j/examples/migrations/1578421040_create_movies_constraint.down.cypher
@@ -0,0 +1 @@
+DROP CONSTRAINT ON (m:Movie) ASSERT m.Name IS UNIQUE
diff --git a/database/neo4j/examples/migrations/1578421040_create_movies_constraint.up.cypher b/database/neo4j/examples/migrations/1578421040_create_movies_constraint.up.cypher
@@ -0,0 +1 @@
+CREATE CONSTRAINT ON (m:Movie) ASSERT m.Name IS UNIQUE
diff --git a/database/neo4j/examples/migrations/1578421725_create_movies.down.cypher b/database/neo4j/examples/migrations/1578421725_create_movies.down.cypher
@@ -0,0 +1,2 @@
+MATCH (m:Movie)
+DELETE m
diff --git a/database/neo4j/examples/migrations/1578421725_create_movies.up.cypher b/database/neo4j/examples/migrations/1578421725_create_movies.up.cypher
@@ -0,0 +1,2 @@
+CREATE (:Movie {name: "Footloose"})
+CREATE (:Movie {name: "Ghost"})
diff --git a/database/neo4j/neo4j.go b/database/neo4j/neo4j.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"io/ioutil"
 	neturl "net/url"
+	"sync/atomic"
 
 	"github.com/golang-migrate/migrate/v4/database"
 	"github.com/neo4j/neo4j-go-driver/neo4j"
@@ -19,17 +20,18 @@ func init() {
 var DefaultMigrationsLabel = "SchemaMigration"
 
 var (
-	ErrNilConfig      = fmt.Errorf("no config")
+	ErrNilConfig = fmt.Errorf("no config")
 )
 
 type Config struct {
-	AuthToken neo4j.AuthToken
-	URL string
+	AuthToken       neo4j.AuthToken
+	URL             string
 	MigrationsLabel string
 }
 
 type Neo4j struct {
 	driver neo4j.Driver
+	lock   uint32
 
 	// Open and WithInstance need to guarantee that config is never nil
 	config *Config
@@ -76,11 +78,17 @@ func (n *Neo4j) Close() error {
 	return n.driver.Close()
 }
 
+// local locking in order to pass tests, Neo doesn't support database locking
 func (n *Neo4j) Lock() error {
+	if !atomic.CompareAndSwapUint32(&n.lock, 0, 1) {
+		return database.ErrLocked
+	}
+
 	return nil
 }
 
 func (n *Neo4j) Unlock() error {
+	atomic.StoreUint32(&n.lock, 0)
 	return nil
 }
 
@@ -96,8 +104,11 @@ func (n *Neo4j) Run(migration io.Reader) error {
 	}
 	defer session.Close()
 
-	_, err = session.Run(string(body[:]), nil)
-	return err
+	result, err := session.Run(string(body[:]), nil)
+	if err != nil {
+		return err
+	}
+	return result.Err()
 }
 
 func (n *Neo4j) SetVersion(version int, dirty bool) error {
@@ -107,9 +118,18 @@ func (n *Neo4j) SetVersion(version int, dirty bool) error {
 	}
 	defer session.Close()
 
-	_, err = session.Run("MERGE (sm:$migration {version: $version, dirty: $dirty})",
-			map[string]interface{}{"migration": n.config.MigrationsLabel, "version": version, "dirty": dirty})
-	return err
+	query := fmt.Sprintf("MERGE (sm:%s {version: $version, dirty: $dirty})",
+		n.config.MigrationsLabel)
+	result, err := session.Run(query, map[string]interface{}{"version": version, "dirty": dirty})
+	if err != nil {
+		return err
+	}
+	return result.Err()
+}
+
+type MigrationRecord struct {
+	Version int
+	Dirty bool
 }
 
 func (n *Neo4j) Version() (version int, dirty bool, err error) {
@@ -119,27 +139,45 @@ func (n *Neo4j) Version() (version int, dirty bool, err error) {
 	}
 	defer session.Close()
 
-	result, err := session.Run("MATCH (sm:$migration) RETURN sm.version, sm.dirty ORDER BY sm.version DESC LIMIT 1",
-			map[string]interface{}{"migration": n.config.MigrationsLabel})
+	query := fmt.Sprintf("MATCH (sm:%s) RETURN sm.version AS version, sm.dirty AS dirty ORDER BY sm.version DESC LIMIT 1",
+		n.config.MigrationsLabel)
+	result, err := session.ReadTransaction(func(transaction neo4j.Transaction) (interface{}, error) {
+		result, err := transaction.Run(query, nil)
+		if err != nil {
+			return nil, err
+		}
+		if result.Next() {
+			record := result.Record()
+			mr := MigrationRecord{}
+			versionResult, ok := record.Get("version")
+			if !ok {
+				mr.Version = -1
+			} else {
+				mr.Version = int(versionResult.(int64))
+			}
+
+			dirtyResult, ok := record.Get("dirty")
+			if ok {
+				mr.Dirty = dirtyResult.(bool)
+			}
+
+			return mr, nil
+		}
+		return nil, result.Err()
+	})
 	if err != nil {
 		return -1, false, err
 	}
-	if result.Next() {
-		versionResult, ok := result.Record().Get("version")
-		if !ok {
-			version = -1
-		} else {
-			version = versionResult.(int)
-		}
-	} else {
-		version = -1
+	if result == nil {
+		return -1, false, nil
 	}
-
-	return version, dirty, nil
+	mr := result.(MigrationRecord)
+	return mr.Version, mr.Dirty, nil
 }
 
 func (n *Neo4j) Drop() error {
-	session, err := n.driver.Session(neo4j.AccessModeWrite); if err != nil {
+	session, err := n.driver.Session(neo4j.AccessModeWrite);
+	if err != nil {
 		return err
 	}
 	defer session.Close()
@@ -149,13 +187,16 @@ func (n *Neo4j) Drop() error {
 }
 
 func (n *Neo4j) ensureVersionConstraint() (err error) {
-	session, err := n.driver.Session(neo4j.AccessModeWrite); if err != nil {
+	session, err := n.driver.Session(neo4j.AccessModeWrite);
+	if err != nil {
 		return err
 	}
 	defer session.Close()
 
-	_, err = session.Run("CREATE CONSTRAINT ON (a:$migration) ASSERT a.version IS UNIQUE",
-		map[string]interface{}{"migration": n.config.MigrationsLabel})
-	return err
+	query := fmt.Sprintf("CREATE CONSTRAINT ON (a:%s) ASSERT a.version IS UNIQUE", n.config.MigrationsLabel)
+	result, err := session.Run(query, nil)
+	if err != nil {
+		return err
+	}
+	return result.Err()
 }
-
diff --git a/database/neo4j/neo4j_test.go b/database/neo4j/neo4j_test.go
@@ -9,21 +9,25 @@ import (
 	"github.com/dhui/dktest"
 	"github.com/neo4j/neo4j-go-driver/neo4j"
 
+	"github.com/golang-migrate/migrate/v4"
 	dt "github.com/golang-migrate/migrate/v4/database/testing"
 	"github.com/golang-migrate/migrate/v4/dktesting"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
 )
 
 var (
-	opts = dktest.Options{PortRequired: true, ReadyFunc: isReady}
+	opts = dktest.Options{PortRequired: true, ReadyFunc: isReady,
+		Env: map[string]string{"NEO4J_AUTH": "neo4j/migratetest", "NEO4J_ACCEPT_LICENSE_AGREEMENT": "yes"}}
 	specs = []dktesting.ContainerSpec{
 		{ImageName: "neo4j:3.5", Options: opts},
-		//{ImageName: "neo4j:3.5-enterprise", Options: opts},
+		{ImageName: "neo4j:3.5-enterprise", Options: opts},
+		{ImageName: "neo4j:3.4", Options: opts},
+		{ImageName: "neo4j:3.4-enterprise", Options: opts},
 	}
 )
 
 func neoConnectionString(host, port string) string {
-	return fmt.Sprintf("bolt://neo4j:neo4j@%s:%s", host, port)
+	return fmt.Sprintf("bolt://neo4j:migratetest@%s:%s", host, port)
 }
 
 func isReady(ctx context.Context, c dktest.ContainerInfo) bool {
@@ -32,7 +36,7 @@ func isReady(ctx context.Context, c dktest.ContainerInfo) bool {
 		return false
 	}
 
-	driver, err := neo4j.NewDriver(neoConnectionString(ip, port), neo4j.BasicAuth("neo4j", "neo4j", ""))
+	driver, err := neo4j.NewDriver(neoConnectionString(ip, port), neo4j.BasicAuth("neo4j", "migratetest", ""))
 	if err != nil {
 		return false
 	}
@@ -45,9 +49,11 @@ func isReady(ctx context.Context, c dktest.ContainerInfo) bool {
 	if err != nil {
 		return false
 	}
-	_, err = session.Run("RETURN 1", nil)
+	result, err := session.Run("RETURN 1", nil)
 	if err != nil {
 		return false
+	} else if result.Err() != nil {
+		return false
 	}
 
 	return true
@@ -72,4 +78,29 @@ func Test(t *testing.T) {
 		}()
 		dt.Test(t, d, []byte("MATCH a RETURN a"))
 	})
+}
+
+func TestMigrate(t *testing.T) {
+	dktesting.ParallelTest(t, specs, func(t *testing.T, c dktest.ContainerInfo) {
+		ip, port, err := c.Port(7687)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		n := &Neo4j{}
+		d, err := n.Open(neoConnectionString(ip, port))
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer func() {
+			if err := d.Close(); err != nil {
+				t.Error(err)
+			}
+		}()
+		m, err := migrate.NewWithDatabaseInstance("file://./examples/migrations", "neo4j", d)
+		if err != nil {
+			t.Fatal(err)
+		}
+		dt.TestMigrate(t, m, []byte("MATCH a RETURN a"))
+	})
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ cli/migrate @@
     .godoc.pid
     vendor/
     .vscode/
+    .idea/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		DROP CONSTRAINT ON (m:Movie) ASSERT m.Name IS UNIQUE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CREATE CONSTRAINT ON (m:Movie) ASSERT m.Name IS UNIQUE
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		CREATE (:Movie {name: "Footloose"})
		CREATE (:Movie {name: "Ghost"})