Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Neo4J Support #320

Merged
merged 27 commits into from
Jan 15, 2020
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
lowercase j
mvid committed Jan 7, 2020

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
commit d5340b95bcf8dd34c8732630ebbec9bb79b0285f
24 changes: 12 additions & 12 deletions database/neo4j/neo4j.go
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ import (
)

func init() {
db := Neo4J{}
db := Neo4j{}
database.Register("bolt", &db)
database.Register("neo4j", &db)
}
@@ -28,7 +28,7 @@ type Config struct {
MigrationsLabel string
}

type Neo4J struct {
type Neo4j struct {
driver neo4j.Driver

// Open and WithInstance need to guarantee that config is never nil
@@ -45,7 +45,7 @@ func WithInstance(config *Config) (database.Driver, error) {
return nil, err
}

driver := &Neo4J{
driver := &Neo4j{
driver: neoDriver,
config: config,
}
@@ -57,7 +57,7 @@ func WithInstance(config *Config) (database.Driver, error) {
return driver, nil
}

func (n *Neo4J) Open(url string) (database.Driver, error) {
func (n *Neo4j) Open(url string) (database.Driver, error) {
uri, err := neturl.Parse(url)
if err != nil {
return nil, err
@@ -72,19 +72,19 @@ func (n *Neo4J) Open(url string) (database.Driver, error) {
})
}

func (n *Neo4J) Close() error {
func (n *Neo4j) Close() error {
return n.driver.Close()
}

func (n *Neo4J) Lock() error {
func (n *Neo4j) Lock() error {
return nil
}

func (n *Neo4J) Unlock() error {
func (n *Neo4j) Unlock() error {
return nil
}

func (n *Neo4J) Run(migration io.Reader) error {
func (n *Neo4j) Run(migration io.Reader) error {
body, err := ioutil.ReadAll(migration)
if err != nil {
return err
@@ -100,7 +100,7 @@ func (n *Neo4J) Run(migration io.Reader) error {
return err
}

func (n *Neo4J) SetVersion(version int, dirty bool) error {
func (n *Neo4j) SetVersion(version int, dirty bool) error {
session, err := n.driver.Session(neo4j.AccessModeRead)
if err != nil {
return err
@@ -112,7 +112,7 @@ func (n *Neo4J) SetVersion(version int, dirty bool) error {
return err
}

func (n *Neo4J) Version() (version int, dirty bool, err error) {
func (n *Neo4j) Version() (version int, dirty bool, err error) {
session, err := n.driver.Session(neo4j.AccessModeRead)
if err != nil {
return -1, false, err
@@ -138,7 +138,7 @@ func (n *Neo4J) Version() (version int, dirty bool, err error) {
return
}

func (n *Neo4J) Drop() error {
func (n *Neo4j) Drop() error {
session, err := n.driver.Session(neo4j.AccessModeWrite); if err != nil {
return err
}
@@ -148,7 +148,7 @@ func (n *Neo4J) Drop() error {
return err
}

func (n *Neo4J) ensureVersionConstraint() (err error) {
func (n *Neo4j) ensureVersionConstraint() (err error) {
session, err := n.driver.Session(neo4j.AccessModeWrite); if err != nil {
return err
}
2 changes: 1 addition & 1 deletion database/neo4j/neo4j_test.go
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ func Test(t *testing.T) {
t.Fatal(err)
}

n := &Neo4J{}
n := &Neo4j{}
d, err := n.Open(neoConnectionString(ip, port))
if err != nil {
t.Fatal(err)