Skip to content

Business intelligence made simple

Added support for neo4j-ruby-driver gem [skip ci]

Andrew Kaned0efc2b3f181
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79922dd3..018a7ed0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
## 3.1.1 (unreleased)
+- Added support for `neo4j-ruby-driver` gem
- Fixes types for SQLite
- Fixed table preview and schema page for SQLite
diff --git a/Gemfile b/Gemfile
index 4e0db597..3c8d0187 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,6 +24,7 @@ gem "propshaft"
# gem "influxdb"
# gem "mysql2"
# gem "neo4j-core"
+# gem "neo4j-ruby-driver"
# gem "odbc_adapter"
# gem "opensearch-ruby"
# gem "presto-client"
diff --git a/lib/blazer/adapters/neo4j_adapter.rb b/lib/blazer/adapters/neo4j_adapter.rb
index 35c79634..387df060 100644
--- a/lib/blazer/adapters/neo4j_adapter.rb
+++ b/lib/blazer/adapters/neo4j_adapter.rb
@@ -7,14 +7,20 @@ module Blazer
error = nil
begin
- result = session.query("#{statement} /*#{comment}*/", bind_params)
- columns = result.columns.map(&:to_s)
- rows = []
- result.each do |row|
- rows << columns.map do |c|
- v = row.send(c)
- v = v.properties if v.respond_to?(:properties)
- v
+ if bolt?
+ result = session.run("#{statement} /*#{comment}*/", bind_params).to_a
+ columns = result.any? ? result.first.keys.map(&:to_s) : []
+ rows = result.map(&:values)
+ else
+ result = session.query("#{statement} /*#{comment}*/", bind_params)
+ columns = result.columns.map(&:to_s)
+ rows = []
+ result.each do |row|
+ rows << columns.map do |c|
+ v = row.send(c)
+ v = v.properties if v.respond_to?(:properties)
+ v
+ end
end
end
rescue => e
@@ -26,8 +32,13 @@ module Blazer
end
def tables
- result = session.query("CALL db.labels()")
- result.rows.map(&:first)
+ if bolt?
+ result = session.run("CALL db.labels()").to_a
+ result.map { |r| r.values.first }
+ else
+ result = session.query("CALL db.labels()")
+ result.rows.map(&:first)
+ end
end
def preview_statement
@@ -52,10 +63,27 @@ module Blazer
def session
@session ||= begin
- require "neo4j/core/cypher_session/adaptors/http"
- http_adaptor = Neo4j::Core::CypherSession::Adaptors::HTTP.new(settings["url"])
- Neo4j::Core::CypherSession.new(http_adaptor)
+ if bolt?
+ uri = URI.parse(settings["url"])
+ auth = Neo4j::Driver::AuthTokens.basic(uri.user, uri.password)
+ database = uri.path.delete_prefix("/")
+ uri.user = nil
+ uri.password = nil
+ uri.path = ""
+ Neo4j::Driver::GraphDatabase.driver(uri, auth).session(database: database)
+ else
+ require "neo4j/core/cypher_session/adaptors/http"
+ http_adaptor = Neo4j::Core::CypherSession::Adaptors::HTTP.new(settings["url"])
+ Neo4j::Core::CypherSession.new(http_adaptor)
+ end
+ end
+ end
+
+ def bolt?
+ if !defined?(@bolt)
+ @bolt = settings["url"].start_with?("bolt")
end
+ @bolt
end
end
end
diff --git a/test/adapters/neo4j_test.rb b/test/adapters/neo4j_test.rb
index 0a1e14af..a02054f6 100644
--- a/test/adapters/neo4j_test.rb
+++ b/test/adapters/neo4j_test.rb
@@ -28,7 +28,7 @@ class Neo4jTest < ActionDispatch::IntegrationTest
end
def test_time
- assert_result [{"hello" => "2022-01-01T08:00:00.000Z"}], "OPTIONAL MATCH () RETURN {created_at} AS `hello`", created_at: "2022-01-01 08:00:00"
+ assert_result [{"hello" => "2022-01-01 08:00:00 UTC"}], "OPTIONAL MATCH () RETURN {created_at} AS `hello`", created_at: "2022-01-01 08:00:00"
end
def test_nil
diff --git a/test/support/adapters.yml b/test/support/adapters.yml
index 2b5e6ca7..d42b214d 100644
--- a/test/support/adapters.yml
+++ b/test/support/adapters.yml
@@ -40,7 +40,7 @@ data_sources:
neo4j:
adapter: neo4j
- url: http://neo4j:secret@localhost:7474/blazer_test
+ url: bolt://neo4j:[email protected]:7687/neo4j
opensearch:
adapter: opensearch