Skip to content

Improve Postgresql adapter when using Apartment.use_sql and Apartment.use_schemas #182

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
NielsKSchjoedt wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Improve Postgresql adapter when using Apartment.use_sql and Apartment.use_schemas #182

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be940e6
Remove CREATE SCHEMA clause from structure dump in postgresql
NielsKSchjoedt Nov 25, 2014
db0321d
Fix foreign key constrains not pointing to default_schema for exclude…
NielsKSchjoedt Nov 25, 2014
def55af
Remove CREATE SCHEMA clause from structure dump in postgresql
NielsKSchjoedt Nov 25, 2014
b549a2a
Fix foreign key constrains not pointing to default_schema for exclude…
NielsKSchjoedt Nov 25, 2014
e1845ad
Merge branch 'master' of https://github.com/influitive/apartment
NielsKSchjoedt Feb 2, 2015
3f3a189
Merge branch 'master' into development
NielsKSchjoedt Feb 2, 2015
e65e984
Merge branch 'development' of https://github.com/influitive/apartment…
NielsKSchjoedt Feb 2, 2015
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
21 changes: 20 additions & 1 deletion lib/apartment/adapters/postgresql_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ class PostgresqlSchemaFromSqlAdapter < PostgresqlSchemaAdapter

PSQL_DUMP_BLACKLISTED_STATEMENTS= [
/SET search_path/i, # overridden later
/SET lock_timeout/i # new in postgresql 9.3
/SET lock_timeout/i, # new in postgresql 9.3
/CREATE SCHEMA/i # remove create schema clause
]

def import_database_schema
Expand Down Expand Up @@ -175,13 +176,31 @@ def pg_dump_schema_migrations_data
def patch_search_path(sql)
search_path = "SET search_path = \"#{current}\", #{default_tenant};"

excluded_tables = Apartment.excluded_models.map{ |model| model.constantize.table_name }.uniq
sql
.split("\n")
.map { |line| format_foreign_key_constraints(line, excluded_tables) }
.select {|line| check_input_against_regexps(line, PSQL_DUMP_BLACKLISTED_STATEMENTS).empty?}
.prepend(search_path)
.join("\n")
end

# Append default_schema to FK definitions, for tables belonging to excluded_models
#
def format_foreign_key_constraints line, excluded_tables
if line.match(/ADD CONSTRAINT .* FOREIGN KEY/)
table_name = line[/REFERENCES (.*)\(/, 1]
new_table_name = "#{default_schema}.#{table_name}"
if excluded_tables.include?(new_table_name)
line.gsub("REFERENCES #{table_name}", "REFERENCES #{new_table_name}")
else
line
end
else
line
end
end

# Checks if any of regexps matches against input
#
def check_input_against_regexps(input, regexps)
Expand Down