Skip to content

Use #lease_connection if available #292

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use #lease_connection if available #292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions lib/annotate_rb/model_annotator/model_wrapper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ def columns
end

def connection
@klass.connection
if @klass.respond_to?(:lease_connection)
@klass.lease_connection
else
@klass.connection
end
end

def database_name
Expand All @@ -56,12 +60,12 @@ def table_exists?
end

def table_comments
@klass.connection.table_comment(@klass.table_name)
connection.table_comment(@klass.table_name)
end

def has_table_comments?
@klass.connection.respond_to?(:table_comment) &&
@klass.connection.table_comment(@klass.table_name).present?
connection.respond_to?(:table_comment) &&
connection.table_comment(@klass.table_name).present?
end

def column_defaults
Expand Down Expand Up @@ -150,13 +154,13 @@ def _retrieve_indexes_from_table
table_name = @klass.table_name
return [] unless table_name

indexes = @klass.connection.indexes(table_name)
indexes = connection.indexes(table_name)
return indexes if indexes.any? || [email protected]_name_prefix

# Try to search the table without prefix
table_name_without_prefix = table_name.to_s.sub(@klass.table_name_prefix.to_s, "")
begin
@klass.connection.indexes(table_name_without_prefix)
connection.indexes(table_name_without_prefix)
rescue ActiveRecord::StatementInvalid => _e
# Mysql2 adapter behaves differently than Sqlite3 and Postgres adapter.
# If `table_name_without_prefix` does not exist, Mysql2 will raise,
Expand Down
Loading