Skip to content

Commit

Permalink
Satisfy Hound (Rubocop)
Browse files Browse the repository at this point in the history
  • Loading branch information
@calebhearth
Mykhaylo Sorochan authored and calebhearth committed Feb 23, 2024
1 parent c437ffc commit d5d4b25
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 43 deletions.
20 changes: 11 additions & 9 deletions lib/scenic/schema_dumper.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,19 @@ def views(stream)
private

def dumpable_views_in_database
return @ordered_dumpable_views_in_database if @ordered_dumpable_views_in_database
@ordered_dumpable_views_in_database ||= begin
existing_views = Scenic.database.views.reject do |view|
ignored?(view.name)
end

existing_views = Scenic.database.views.reject do |view|
ignored?(view.name)
tsorted_views(existing_views.map(&:name)).map do |view_name|
existing_views.find { |ev| ev.name == view_name }
end.compact
end

@ordered_dumpable_views_in_database = tsorted_views(existing_views.map(&:name)).map do |view_name|
existing_views.find { |ev| ev.name == view_name }
end.compact
end

# When dumping the views, their order must be topologically sorted to take into account dependencies
# When dumping the views, their order must be topologically
# sorted to take into account dependencies
def tsorted_views(views_names)
views_hash = TSortableHash.new

Expand All @@ -75,7 +76,8 @@ def tsorted_views(views_names)
views_names.delete(dependent)
end

# after dependencies, there might be some views left that don't have any dependencies
# after dependencies, there might be some views left
# that don't have any dependencies
views_names.sort.each { |v| views_hash[v] = [] }

views_hash.tsort
Expand Down
82 changes: 48 additions & 34 deletions spec/scenic/schema_dumper_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ class SearchInAHaystack < ActiveRecord::Base

it "dumps a create_view for a materialized view in the database" do
view_definition = "SELECT 'needle'::text AS haystack"
Search.connection.create_view :searches, materialized: true, sql_definition: view_definition
Search.connection.create_view :searches,
materialized: true, sql_definition: view_definition

expect(output).to include 'create_view "searches", materialized: true, sql_definition: <<-SQL'
expect(output).to include view_definition
Expand All @@ -66,11 +67,11 @@ class SearchInAHaystack < ActiveRecord::Base
stream = StringIO.new

ActiveRecord::SchemaDumper.dump(Search.connection, stream)

views = stream.string.lines.grep(/create_view/).map do |view_line|
view_line.match('create_view "(?<name>.*)"')[:name]
end
expect(views).to eq(%w[scenic.bananas scenic.apples])

end

before(:each) do
Expand Down Expand Up @@ -112,12 +113,13 @@ class SearchInAHaystack < ActiveRecord::Base
context "with views using unexpected characters in name" do
it "dumps a create_view for a view in the database" do
view_definition = "SELECT 'needle'::text AS haystack"
Search.connection.create_view '"search in a haystack"', sql_definition: view_definition
Search.connection.create_view '"search in a haystack"',
sql_definition: view_definition

expect(output).to include 'create_view "\"search in a haystack\"",'
expect(output).to include view_definition

Search.connection.drop_view :'"search in a haystack"'
Search.connection.drop_view :"\"search in a haystack\""

silence_stream($stdout) { eval(output) } # standard:disable Security/Eval

Expand All @@ -129,15 +131,15 @@ class SearchInAHaystack < ActiveRecord::Base
it "dumps a create_view for a view in the database" do
view_definition = "SELECT 'needle'::text AS haystack"
Search.connection.execute(
"CREATE SCHEMA scenic; SET search_path TO scenic, public",
"CREATE SCHEMA scenic; SET search_path TO scenic, public"
)
Search.connection.create_view 'scenic."search in a haystack"',
sql_definition: view_definition

expect(output).to include 'create_view "scenic.\"search in a haystack\"",'
expect(output).to include view_definition

Search.connection.drop_view :'scenic."search in a haystack"'
Search.connection.drop_view :"scenic.\"search in a haystack\""

silence_stream($stdout) { eval(output) } # standard:disable Security/Eval

Expand All @@ -148,11 +150,11 @@ class SearchInAHaystack < ActiveRecord::Base
context "with views ordered by name" do
it "sorts views without dependencies" do
Search.connection.create_view "cucumber_needles",
sql_definition: "SELECT 'kukumbas'::text as needle"
sql_definition: "SELECT 'kukumbas'::text AS needle"
Search.connection.create_view "vip_needles",
sql_definition: "SELECT 'vip'::text as needle"
sql_definition: "SELECT 'vip'::text AS needle"
Search.connection.create_view "none_needles",
sql_definition: "SELECT 'none_needles'::text as needle"
sql_definition: "SELECT 'none_needles'::text AS needle"

# Same here, no dependencies among existing views, all views are sorted
sorted_views = %w[cucumber_needles vip_needles none_needles].sort
Expand All @@ -162,15 +164,15 @@ class SearchInAHaystack < ActiveRecord::Base

it "sorts according to dependencies" do
Search.connection.create_table(:tasks) { |t| t.integer :performer_id }
Search.connection.create_table(:notes) { |t|
Search.connection.create_table(:notes) do |t|
t.text :title
t.integer :author_id
}
end
Search.connection.create_table(:users) { |t| t.text :nickname }
Search.connection.create_table(:roles) { |t|
Search.connection.create_table(:roles) do |t|
t.text :name
t.integer :user_id
}
end

Search.connection.create_view "recent_tasks", sql_definition: <<-SQL
SELECT id, performer_id FROM tasks WHERE id > 42
Expand All @@ -186,26 +188,26 @@ class SearchInAHaystack < ActiveRecord::Base
Search.connection.create_view "angry_zombies", sql_definition: <<-SQL
SELECT
users.nickname,
recent_tasks.id AS task_id,
nirvana_notes.title AS talk
recent_tasks.id AS task_id,
nirvana_notes.title AS talk
FROM users
JOIN roles ON roles.user_id = users.id
JOIN nirvana_notes ON nirvana_notes.author_id = roles.id
JOIN recent_tasks ON recent_tasks.performer_id = roles.id
SQL
Search.connection.create_view "doctor_zombies", sql_definition: <<-SQL
SELECT id FROM old_roles WHERE name LIKE '%Dr%'
SELECT id FROM old_roles WHERE name LIKE '%dr%'
SQL
Search.connection.create_view "xenomorphs", sql_definition: <<-SQL
SELECT id, name FROM roles WHERE name = 'xeno'
SQL
Search.connection.create_view "important_messages", sql_definition: <<-SQL
SELECT id, title FROM notes WHERE title LIKE '%IMPORTANT%'
SELECT id, title FROM notes WHERE title LIKE '%important%'
SQL

# Converted with https://github.com/ggerganov/dot-to-ascii
# converted with https://github.com/ggerganov/dot-to-ascii
# digraph {
# rankdir = "RL";
# rankdir = "bt";
# xenomorphs;
# important_messages;
# doctor_zombies -> old_roles;
Expand All @@ -214,21 +216,33 @@ class SearchInAHaystack < ActiveRecord::Base
# angry_zombies -> recent_tasks;
# }
#
# +--------------------+
# | recent_tasks |
# +--------------------+
# ^
# |
# |
# +----------------+ +-----------+ +---------------+ +--------------------+
# | doctor_zombies | --> | old_roles | <-- | nirvana_notes | <-- | angry_zombies |
# +----------------+ +-----------+ +---------------+ +--------------------+
# +--------------------+
# | important_messages |
# +--------------------+
# +--------------------+
# | xenomorphs |
# +--------------------+
# +--------------------+
# | doctor_zombies |
# +--------------------+
# |
# |
# v
# +--------------------+
# | old_roles |
# +--------------------+
# ^
# |
# |
# +--------------------+
# | nirvana_notes |
# +--------------------+
# ^
# |
# |
# +--------------------+ +--------------+
# | angry_zombies | --> | recent_tasks |
# +--------------------+ +--------------+
# +--------------------+
# | important_messages |
# +--------------------+
# +--------------------+
# | xenomorphs |
# +--------------------+
expect(views_in_output_order).to eq(%w[
old_roles
nirvana_notes
Expand Down

0 comments on commit d5d4b25

Please sign in to comment.