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

POC to close #469 - Establish connection to the correct pool when using a replica #470

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/blazer/adapters/sql_adapter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def initialize(data_source)
def self.name
"Blazer::Connection::Adapter#{object_id}"
end
establish_connection(data_source.settings["url"]) if data_source.settings["url"]
establish_connection(data_source.sql_establish_connection_param) if data_source.sql_establish_connection_param
end
end

Expand Down
4 changes: 4 additions & 0 deletions lib/blazer/data_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@ def bind_params(statement, variables)
end
end

def sql_establish_connection_param
settings["sql_establish_connection_param"]&.to_sym || settings["url"]
end

protected

def adapter_instance
Expand Down
79 changes: 79 additions & 0 deletions test/adapters/postgresql_replica_test.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
require_relative "../test_helper"

class PostgresqlTest < ActionDispatch::IntegrationTest
include AdapterTest

def data_source
"postgresql"
end

def setup
settings = { "data_sources" => { "postgresql" => { "establish_connection_param" => "primary_replica" } } }
Blazer.instance_variable_set(:@settings, settings)
end

def test_run
assert_result [{"hello" => "world"}], "SELECT 'world' AS hello"
end

def test_audit
assert_audit "SELECT $1 AS hello\n\n[\"world\"]", "SELECT {var} AS hello", var: "world"
end

def test_string
assert_result [{"hello" => "world"}], "SELECT {var} AS hello", var: "world"
end

def test_integer
assert_result [{"hello" => "1"}], "SELECT {var} AS hello", var: "1"
end

def test_float
assert_result [{"hello" => "1.5"}], "SELECT {var} AS hello", var: "1.5"
end

def test_time
assert_result [{"hello" => "2022-01-01 08:00:00"}], "SELECT {created_at} AS hello", created_at: "2022-01-01 08:00:00"
end

def test_nil
assert_result [{"hello" => nil}], "SELECT {var} AS hello", var: ""
end

def test_single_quote
assert_result [{"hello" => "'"}], "SELECT {var} AS hello", var: "'"
end

def test_double_quote
assert_result [{"hello" => '"'}], "SELECT {var} AS hello", var: '"'
end

def test_backslash
assert_result [{"hello" => "\\"}], "SELECT {var} AS hello", var: "\\"
end

def test_multiple_variables
assert_result [{"c1" => "one", "c2" => "two", "c3" => "one"}], "SELECT {var} AS c1, {var2} AS c2, {var} AS c3", var: "one", var2: "two"
end

def test_bad_position
assert_bad_position "SELECT 'world' AS {var}", var: "hello"
end

def test_bad_position_before
assert_error "syntax error at or near \"SELECT$1\"", "SELECT{var}", var: "world"
end

def test_bad_position_after
assert_error "syntax error at or near \"456\"\nLINE 1: SELECT $1 456", "SELECT {var}456", var: "world"
assert_equal "SELECT $1 456\n\n[\"world\"]", Blazer::Audit.last.statement
end

def test_quoted
assert_error "could not determine data type of parameter $1", "SELECT '{var}' AS hello", var: "world"
end

def test_binary_output
assert_result [{"bytea" => "\\x68656c6c6f"}], "SELECT 'hello'::bytea"
end
end
8 changes: 6 additions & 2 deletions test/internal/config/database.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
test:
adapter: postgresql
database: blazer_test
primary:
adapter: postgresql
database: blazer_test
primary_replica:
adapter: postgresql
database: blazer_test