Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/fx.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def self.load

# @return [Fx::Configuration] F(x)'s current configuration
def self.configuration
@_configuration ||= Configuration.new
@_configuration ||= Fx::Configuration.new
end

# Set F(x)'s configuration
Expand Down
6 changes: 3 additions & 3 deletions lib/fx/adapters/postgres.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def initialize(connectable = ActiveRecord::Base)
#
# @return [Array<Fx::Function>]
def functions
Functions.all(connection)
Fx::Adapters::Postgres::Functions.all(connection)
end

# Returns an array of triggers in the database.
Expand All @@ -57,7 +57,7 @@ def functions
#
# @return [Array<Fx::Trigger>]
def triggers
Triggers.all(connection)
Fx::Adapters::Postgres::Triggers.all(connection)
end

# Creates a function in the database.
Expand Down Expand Up @@ -152,7 +152,7 @@ def drop_trigger(name, on:)
delegate :execute, to: :connection

def connection
Connection.new(connectable.connection)
Fx::Adapters::Postgres::Connection.new(connectable.connection)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/fx/adapters/postgres/functions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Functions
#
# @return [Array<Fx::Function>]
def self.all(connection)
QueryExecutor.call(
Fx::Adapters::Postgres::QueryExecutor.call(
connection: connection,
query: FUNCTIONS_WITH_DEFINITIONS_QUERY,
model_class: Fx::Function
Expand Down
2 changes: 1 addition & 1 deletion lib/fx/adapters/postgres/triggers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Triggers
#
# @return [Array<Fx::Trigger>]
def self.all(connection)
QueryExecutor.call(
Fx::Adapters::Postgres::QueryExecutor.call(
connection: connection,
query: TRIGGERS_WITH_DEFINITIONS_QUERY,
model_class: Fx::Trigger
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/fx/function/function_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def migration_class_name
end

def formatted_name
NameHelper.format_for_migration(singular_name)
Fx::Generators::NameHelper.format_for_migration(singular_name)
end
end

Expand Down
4 changes: 2 additions & 2 deletions lib/generators/fx/trigger/trigger_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ def migration_class_name
end

def formatted_name
NameHelper.format_for_migration(singular_name)
Fx::Generators::NameHelper.format_for_migration(singular_name)
end

def formatted_table_name
NameHelper.format_table_name_from_hash(table_name)
Fx::Generators::NameHelper.format_table_name_from_hash(table_name)
end
end

Expand Down